merge setup.py

.circleci/config.yml

@@ -3,11 +3,10 @@ version: 2.0
 build_and_test: &build_and_test_steps
   - checkout
   - run: sudo pip install -r requirements.txt
+  - run: pip install --user .
   - run: sudo pip install pytest
   - run: python --version ; pip --version ; pwd ; ls -l
-  #- run: pytest # test_s2gs test_replays
-  - run: python -m unittest discover test_s2gs
-  - run: python -m unittest discover test_replays
+  - run: pytest
 
 
 jobs:

setup.py

@@ -42,9 +42,10 @@
             "sc2json = sc2reader.scripts.sc2json:main",
         ]
     },
-    install_requires=["mpyq>=0.2.3", "argparse", "ordereddict", "unittest2", "pil"]
+    install_requires=['mpyq>=0.2.3', 'argparse', 'ordereddict', 'unittest2', 'pil']
     if float(sys.version[:3]) < 2.7
-    else ["mpyq>=0.2.4"],
+    else ['mpyq>=0.2.4'],
+    tests_require=["pytest"],
     packages=setuptools.find_packages(),
     include_package_data=True,
     zip_safe=True,