Merge pull request #432 from zdict/issue-428

.circleci/config.yml

@@ -1,4 +1,4 @@
-# eython CircleCI 2.0 configuration file
+# Python CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/language-python/ for more details
 #
@@ -72,7 +72,7 @@ variables:
           name: run tests
           command: |
             . venv/bin/activate
-            python setup.py test
+            make test
 
       - store_test_results:
           path: test-reports

.travis.yml

@@ -39,7 +39,15 @@ install:
     - pip freeze
 
 script:
-    - python setup.py test
+    - pip install -r requirements-test.txt
+    - make test
+
+before_cache:
+    # Remove __pycahce__ dirs and *.pyc, *.pyo files before uploading cache.
+    # Which will changes between every single builds.
+    # This could make Travis CI don't upload cache every time.
+    - python3 -Bc "import pathlib; [p.unlink() for p in pathlib.Path('$HOME/venv').rglob('*.py[co]')]"
+    - python3 -Bc "import pathlib; [p.rmdir() for p in pathlib.Path('$HOME/venv').rglob('__pycache__')]"
 
 after_success:
     - coveralls

Makefile

@@ -27,7 +27,10 @@ clean: clean-pyc clean-vim-swap-files
 	rm -rf build dist htmlcov .coverage* .cache .eggs
 
 test:
-	python setup.py test
+	py.test
+
+test-with-pdb:
+	py.test --pdb
 
 # Make docker-zdict don't complain about no make rules for apple, bird, ...
 %:

README.rst

@@ -228,17 +228,20 @@ If you use `virtualenv`, you may want to create a new enviroment for `zdict`::
 
 Once you installed it with the command above,
 just execute `zdict` after modification.
-Don't need to install it again.
+No need to install it again.
 
-We use ``py.test``::
+Install the packages for testing::
 
     $ pip install pytest pytest-cov coverage
-    $ python setup.py test
 
-or::
+We use ``py.test``::
 
     $ py.test
 
+or::
+
+    $ make test
+
 After runing testing, we will get a coverage report in html.
 We can browse around it::
 
@@ -254,11 +257,11 @@ Debugging
 
 ``py.test`` can prompt ``pdb`` shell when your test case failed::
 
-    $ python setup.py test -a "--pdb"
+    $ py.test --pdb
 
 or::
 
-    $ py.test --pdb
+    $ make test-with-pdb
 
 
 Bug Report

setup.py

@@ -2,7 +2,6 @@
 import os
 
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
 
 
 ROOT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -40,25 +39,6 @@ def get_test_req():
 version = get_zdict_version()
 
 
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
-
 install_requirements = parse_requirements(
     os.path.join(ROOT_DIR, 'requirements.txt')
 )
@@ -72,7 +52,6 @@ def run_tests(self):
     scripts=['scripts/zdict'],
     install_requires=install_requirements,
     tests_require=get_test_req(),
-    cmdclass={'test': PyTest},
 
     name='zdict',
     version=version,