Stricter PEP-8 conformance.

[python-bulletml.git] / setup.py

diff --git a/setup.py b/setup.py
index ba5af94..f49d723 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -6,36 +6,41 @@ import shutil
 import sys
 
 from distutils.core import setup, Command, Extension
-from Pyrex.Distutils import build_ext
-
 from distutils.command.clean import clean as distutils_clean
 from distutils.command.sdist import sdist as distutils_sdist
 
+
 class clean(distutils_clean):
     def run(self):
         # In addition to what the normal clean run does, remove pyc
         # and pyo and backup files from the source tree.
         distutils_clean.run(self)
+
         def should_remove(filename):
-            if (filename.lower()[-4:] in [".pyc", ".pyo"] or
-                filename.endswith("~") or
-                (filename.startswith("#") and filename.endswith("#"))):
+            if (filename.lower()[-4:] in [".pyc", ".pyo"]
+                or filename.endswith("~")
+                or (filename.startswith("#")
+                    and filename.endswith("#"))):
                 return True
             else:
                 return False
         for pathname, dirs, files in os.walk(os.path.dirname(__file__)):
             for filename in filter(should_remove, files):
-                try: os.unlink(os.path.join(pathname, filename))
+                try:
+                    os.unlink(os.path.join(pathname, filename))
                 except EnvironmentError as err:
                     print(str(err))
 
-        try: os.unlink("MANIFEST")
-        except OSError: pass
+        try:
+            os.unlink("MANIFEST")
+        except OSError:
+            pass
 
         for base in ["coverage", "build", "dist"]:
-             path = os.path.join(os.path.dirname(__file__), base)
-             if os.path.isdir(path):
-                 shutil.rmtree(path)
+            path = os.path.join(os.path.dirname(__file__), base)
+            if os.path.isdir(path):
+                shutil.rmtree(path)
+
 
 class coverage_cmd(Command):
     description = "generate test coverage data"
@@ -43,7 +48,7 @@ class coverage_cmd(Command):
 
     def initialize_options(self):
         pass
-    
+
     def finalize_options(self):
         pass
 
@@ -52,6 +57,7 @@ class coverage_cmd(Command):
         tracer = trace.Trace(
             count=True, trace=False,
             ignoredirs=[sys.prefix, sys.exec_prefix])
+
         def run_tests():
             import bulletml
             try:
@@ -59,13 +65,16 @@ class coverage_cmd(Command):
             except NameError:
                 pass
             self.run_command("test")
+
         tracer.runfunc(run_tests)
         results = tracer.results()
         coverage = os.path.join(os.path.dirname(__file__), "coverage")
         results.write_results(show_missing=True, coverdir=coverage)
         map(os.unlink, glob.glob(os.path.join(coverage, "[!b]*.cover")))
-        try: os.unlink(os.path.join(coverage, "..setup.cover"))
-        except OSError: pass
+        try:
+            os.unlink(os.path.join(coverage, "..setup.cover"))
+        except OSError:
+            pass
 
         total_lines = 0
         bad_lines = 0
@@ -80,16 +89,18 @@ class coverage_cmd(Command):
         print("Coverage data written to %s (%d/%d, %0.2f%%)" % (
             coverage, total_lines - bad_lines, total_lines, pct))
 
+
 class sdist(distutils_sdist):
     def run(self):
         self.run_command("test")
         distutils_sdist.run(self)
 
+
 class test_cmd(Command):
     description = "run automated tests"
     user_options = [
         ("to-run=", None, "list of tests to run (default all)"),
-        ]
+    ]
 
     def initialize_options(self):
         self.to_run = []
@@ -106,9 +117,9 @@ class test_cmd(Command):
 
 if __name__ == "__main__":
     setup(cmdclass=dict(clean=clean, test=test_cmd, coverage=coverage_cmd,
-                        sdist=sdist, build_ext=build_ext),
-          name="python-bulletml", version="1",
-          url="http://code.google.com/p/python-bulletml/",
+                        sdist=sdist),
+          name="python-bulletml", version="3",
+          url="https://yukkurigames.com/python-bulletml/",
           description="parse and run BulletML scripts",
           author="Joe Wreschnig",
           author_email="joe.wreschnig@gmail.com",
@@ -116,25 +127,23 @@ if __name__ == "__main__":
           packages=["bulletml"],
           data_files=glob.glob("examples/*/*.xml") + ["examples/template.xml"],
           scripts=["bulletml-runner", "bulletml-to-bulletyaml"],
-          ext_modules=[
-              Extension('bulletml._collision', ['bulletml/_collision.pyx'])],
+          ext_modules=[Extension(
+              'bulletml._collision',
+              [os.path.join('bulletml', '_collision.c')])],
           long_description="""\
 BulletML is the Bullet Markup Language. BulletML can describe the
 barrage of bullets in shooting games. (For example Progear, Psyvariar,
 Gigawing2, G DARIUS, XEVIOUS, ...) This module parses and executes
 BulletML scripts in Python. All data structures in it are
-renderer-agnostic.
+renderer-agnostic. A sample renderer for Pygame is included. The full
+API documentation is contained in its Python docstrings.
 
 In addition to the standard BulletML XML format, this module supports
-an equivalent YAML format.
-
-Finally, two simple collision routines are provided, bulletml.overlaps
-for stationary circles and bulletml.collides for moving circles.
-
-A sample renderer for Pygame is included.
+an equivalent YAML format. For convenience, two simple collision
+routines are provided, bulletml.overlaps for stationary circles and
+bulletml.collides for moving circles.
 
 More information is available at the BulletML homepage,
 http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html, or the
-python-bullet homepage, http://code.google.com/p/python-bulletml/.
-"""
-          )
+python-bulletml homepage, https://yukkurigames.com/python-bulletml/.
+""")