Fix setup.py for Python 2, add missing .wads, add verbose to Oblige e…

…xe subprocess

README.md

@@ -22,7 +22,7 @@ It also adds 2 additional level sizes: `micro` and `tiny`.
 
 To install on Ubuntu use:
 ```
-sudo apt install \
+sudo apt-get install \
                 g++ \
                 binutils \
                 make \
@@ -72,24 +72,20 @@ Example of usage with ViZDoom: [ViZDoom/examples/python/oblige.py](https://githu
 - `"game"`: `"doom2"`, `"doom"`
 - `"engine"`: `"zdoom"`, `"gzdoom"`, `"vizdoom"`
 - `"length"`: `"single"`, `"few"`, `"episode"`, `"game"`
-- `"theme"`: `"original"`, `"mostly_original"`, `"epi"`, `"mostly_epi"`, `"bit_mixed"`, `"jumble"`
-          `"tech"`, `"mostly_tech"`, `"urban"`, `"mostly_urban"`, `"hell"`, `"mostly_hell"`
-
+- `"theme"`: `"original"`, `"mostly_original"`, `"epi"`, `"mostly_epi"`, `"bit_mixed"`, `"jumble"`, `"tech"`, `"mostly_tech"`, `"urban"`, `"mostly_urban"`, `"hell"`, `"mostly_hell"`
 - `"size"`: `"micro"`, `"tiny"`, `"small"`, `"regular"`, `"large"`, `"extreme"`, `"epi"`, `"prog"`, `"mixed"`
 - `"outdoors"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"caves"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"liquids"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"hallways"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"teleporters"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"steepness"`: `"mixed"`, `"none"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
-
 - `"mons"`: `"scarce"`, `"few"`, `"less"`, `"some"`, `"more"`, `"nuts"`, `"mixed"`, `"none"`
 - `"strength"`: `"weak"`, `"easier"`, `"normal"`, `"harder"`, `"tough"`, `"crazy"`
 - `"ramp_up"`: `"slow"`, `"medium"`, `"fast"`, `"episodic"`
 - `"bosses"`: `"none"`, `"easier"`, `"normal"`, `"harder"`
 - `"traps"`: `"none"`, `"mixed"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
 - `"cages"`: `"none"`, `"mixed"`, `"rare"`, `"few"`, `"less"`, `"some"`, `"more"`, `"heaps"`
-
 - `"health"`: `"none"`, `"scarce"`, `"less"`, `"bit_less"`, `"normal"`, `"bit_more"`, `"more"`, `"heaps"`
 - `"ammo"`: `"none"`, `"scarce"`, `"less"`, `"bit_less"`, `"normal"`, `"bit_more"`, `"more"`, `"heaps"`
 - `"weapons"`: `"none"`, `"very_soon"`, `"sooner"`, `"normal"`, `"later"`, `"very_late"`

pyoblige/oblige.py

@@ -344,8 +344,8 @@ def generate(self, wad_path, verbose=False):
                   "\nOblige executable path: {}".format(config_path, wad_path, oblige_path))
 
         cmd = "{} --batch {} --load {} --keep".format(oblige_exe, wad_path, config_path)
-        # if verbose:
-        #    cmd += " --verbose"
+        if verbose:
+           cmd += " --verbose"
 
         # Launch Oblige
         try:

setup.py

@@ -32,12 +32,18 @@ def run(self):
             raise
         build.run(self)
 
+# Python 3.5+ only
+#extra_files = [x for x in glob.glob("{}/**".format(oblige_src_path), recursive=True)]
 
-extra_files = [x for x in glob.glob("{}/**".format(oblige_src_path), recursive=True)]
+# Python 2.7 + Python 3 solution
+extra_files = []
+for root, dirnames, filenames in os.walk('{}/'.format(oblige_src_path)):
+    for filename in filenames:
+        extra_files.append(os.path.join(root, filename))
 
 setup(
     name='oblige',
-    version='0.1.1',
+    version='0.1.2',
     description='Level generator for DOOM',
     long_description="Level generator for DOOM. Wrapper for Oblige.",
     url='https://github.com/mwydmuch/PyOblige',