Revert "stop having the runner script just as script but instead have a script as console_script (kyuridenamida#46)" (kyuridenamida#47)

kyuridenamida · web-flow · commit 1ae4cb48f878 · 2018-12-30T05:07:21.000+09:00
This reverts commit 94a9f85.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1 @@
-recursive-include atcodertools/tools/templates/ *
-include requirements.txt
+recursive-include atcodertools/tools/templates/ *
diff --git a/atcoder-tools b/atcoder-tools
@@ -1,10 +1,10 @@
+#!/usr/bin/env python3
 import sys
 
 from atcodertools.tools.envgen import main as envgen_main
 from atcodertools.tools.tester import main as tester_main
 
-
-def main():
+if __name__ == '__main__':
     if len(sys.argv) < 2 or sys.argv[1] not in ("gen", "test"):
         print("Usage:")
         print("{} gen -- to generate workspace".format(sys.argv[0]))
@@ -19,7 +19,3 @@ def main():
 
     if sys.argv[1] == "test":
         sys.exit(tester_main(prog, args))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/setup.py b/setup.py
@@ -27,11 +27,7 @@ def _requires_from_file(filename):
     packages=find_packages(exclude=('tests',)),
     install_requires=_requires_from_file('requirements.txt'),
     license="MIT",
-    entry_points={
-        "console_scripts": [
-                "atcoder-tools=atcodertools.tools.run_script:main",
-        ],
-    },
+    scripts=['atcoder-tools'],
     include_package_data=True,
     classifiers=[
         'Development Status :: 4 - Beta',

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-recursive-include atcodertools/tools/templates/ *`
`2`		`-include requirements.txt`
	`1`	`+recursive-include atcodertools/tools/templates/ *`