Merge branch 'ants/build' into ants/puzzlec

puzzlesolver/puzzles/_models/puzzle.py

@@ -63,9 +63,9 @@ def toString(self, mode="minimal"):
         Outputs:
             String representation -- String"""
 
-        if mode is "minimal" and hasattr(self, "serialize"):
+        if mode == "minimal" and hasattr(self, "serialize"):
             return self.serialize()
-        if mode is "complex" and hasattr(self, "printInfo"):
+        if mode == "complex" and hasattr(self, "printInfo"):
             return self.printInfo()
         return str(self)
 

puzzlesolver/puzzles/hanoi.py

@@ -118,9 +118,9 @@ def toString(self, mode="minimal"):
         Outputs:
             String representation -- String"""
 
-        if mode is "minimal":
+        if mode == "minimal":
             return str(self)
-        elif mode is "complex":
+        elif mode == "complex":
             output = ""
             for j in range(self.disk_variant):
                 for rod in self.rods:

setup.py

@@ -1,9 +1,16 @@
-from setuptools import setup, Extension
+from setuptools import setup, Extension, find_packages
 
 setup(
-    name="puzzlesolver",
-    version="1.0.0",
-    packages=['puzzlesolver'],
+    name="GamesmanPuzzles",
+    version="0.0.1",
+    packages=find_packages(),
+    install_requires=[
+        'Flask>=1.1.1',
+        'pytest>=5.3.5',
+        'sqlitedict>=1.6.0',
+        'progressbar2>=3.51.0',
+        'networkx>=2.4',
+    ],
     ext_modules=[
         Extension(
             "puzzlesolver._puzzlesolverc", 
@@ -17,5 +24,6 @@
                 "puzzlesolver/src/Hanoi.c"
             ]
         )
-    ]
+    ],
+    python_requires='>=3.6'
 )

tests/conftest.py

@@ -1,7 +1,12 @@
 import pytest
 import tempfile
 
+# Import server
+import sys
+sys.path.append("..")
+
 import server
+
 from puzzlesolver.util import PuzzleValue
 from puzzlesolver.puzzles import GraphPuzzle