[game-data-packager] 01/01: Move non-installed Python into tools/ so we can install all of g_d_p again

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 5e525e7f5380630997e348df2ee54afaff075cbf
Author: Simon McVittie <smcv at debian.org>
Date:   Tue May 5 23:54:09 2015 +0100

    Move non-installed Python into tools/ so we can install all of g_d_p again
    
    Listing individual Python files to install seems really error-prone.
    I would like to be able to rely on ./game_data_packager being exactly
    what is placed on sys.path.
---
 Makefile                                         |  8 ++++----
 debian/game-data-packager.install                | 10 +---------
 {game_data_packager => tools}/bash_completion.py |  0
 {game_data_packager => tools}/check_syntax.py    |  2 +-
 {game_data_packager => tools}/stats.py           |  2 +-
 {game_data_packager => tools}/yaml2json.py       |  0
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 39948d5..1558948 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,10 @@ out/%: data/%
 	if [ -L $< ]; then cp -a $< $@ ; else install -m644 $< $@ ; fi
 
 out/%.json: data/%.yaml
-	python3 game_data_packager/yaml2json.py $< > $@ || rm -f $@
+	python3 tools/yaml2json.py $< > $@ || rm -f $@
 
 out/bash_completion: $(in_yaml)
-	python3 game_data_packager/bash_completion.py > ./out/bash_completion
+	python3 tools/bash_completion.py > ./out/bash_completion
 	chmod 0644 ./out/bash_completion
 
 out/changelog.gz: debian/changelog
@@ -66,8 +66,8 @@ clean:
 	for d in $(DIRS); do [ ! -d "$$d" ]  || rmdir "$$d"; done
 
 check:
-	LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. python3 -m game_data_packager.check_syntax
-	LC_ALL=C pyflakes3 game_data_packager/*.py game_data_packager/*/*.py runtime/*.py || :
+	LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. python3 tools/check_syntax.py
+	LC_ALL=C pyflakes3 game_data_packager/*.py game_data_packager/*/*.py runtime/*.py tools/*.py || :
 
 # Requires additional setup, so not part of "make check"
 manual-check:
diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install
index d8e42c9..929bd83 100644
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@ -1,15 +1,7 @@
 out/game-data-packager        usr/games
 etc/game-data-packager.conf   etc
 etc/*-mirrors                 etc/game-data-packager
-game_data_packager/games            usr/share/games/game-data-packager/game_data_packager
-game_data_packager/__init__.py      usr/share/games/game-data-packager/game_data_packager
-game_data_packager/__main__.py      usr/share/games/game-data-packager/game_data_packager
-game_data_packager/config.py        usr/share/games/game-data-packager/game_data_packager
-game_data_packager/make_template.py usr/share/games/game-data-packager/game_data_packager
-game_data_packager/paths.py         usr/share/games/game-data-packager/game_data_packager
-game_data_packager/steam.py         usr/share/games/game-data-packager/game_data_packager
-game_data_packager/util.py          usr/share/games/game-data-packager/game_data_packager
-game_data_packager/version.py       usr/share/games/game-data-packager/game_data_packager
+game_data_packager            usr/share/games/game-data-packager
 out/*.control.in              usr/share/games/game-data-packager
 out/*.copyright               usr/share/games/game-data-packager
 out/*.copyright.in            usr/share/games/game-data-packager
diff --git a/game_data_packager/bash_completion.py b/tools/bash_completion.py
old mode 100644
new mode 100755
similarity index 100%
rename from game_data_packager/bash_completion.py
rename to tools/bash_completion.py
diff --git a/game_data_packager/check_syntax.py b/tools/check_syntax.py
old mode 100644
new mode 100755
similarity index 95%
rename from game_data_packager/check_syntax.py
rename to tools/check_syntax.py
index 7745da2..3ee8747
--- a/game_data_packager/check_syntax.py
+++ b/tools/check_syntax.py
@@ -18,7 +18,7 @@
 import os
 import yaml
 
-from . import load_games
+from game_data_packager import load_games
 
 if __name__ == '__main__':
     for name, game in load_games().items():
diff --git a/game_data_packager/stats.py b/tools/stats.py
old mode 100644
new mode 100755
similarity index 96%
rename from game_data_packager/stats.py
rename to tools/stats.py
index 1829668..f08c904
--- a/game_data_packager/stats.py
+++ b/tools/stats.py
@@ -15,7 +15,7 @@
 # You can find the GPL license text on a Debian system under
 # /usr/share/common-licenses/GPL-2.
 
-from . import load_games,GameData,FillResult
+from game_data_packager import (load_games, GameData, FillResult)
 
 games = []
 for name, game in load_games().items():
diff --git a/game_data_packager/yaml2json.py b/tools/yaml2json.py
old mode 100644
new mode 100755
similarity index 100%
rename from game_data_packager/yaml2json.py
rename to tools/yaml2json.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git