Merge pull request #87 from rth/simplfy-example

Lint examples/simple-extension and try to simplify setup.py

Author: kngwyu

.travis.yml

@@ -39,9 +39,11 @@ before_install:
   - source ./ci/travis/setup.sh
 
 install:
-  - pip install setuptools-rust pytest pytest-benchmark tox numpy
+  - pip install setuptools-rust pytest pytest-benchmark \
+             tox numpy flake8
 
 script:
+  - flake8 examples/
   - ./ci/travis/test.sh
 
 deploy:

examples/simple-extension/rust_ext/__init__.py

@@ -1 +1 @@
-from .rust_ext import *
+from .rust_ext import *  # noqa

examples/simple-extension/setup.py

@@ -1,32 +1,9 @@
-import os
-import subprocess
 import sys
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
 from setuptools_rust import RustExtension
 
-class PyTest(TestCommand):
-    user_options = []
-    def run(self):
-        self.run_command("test_rust")
-        import subprocess
-        errno = subprocess.call(['pytest', 'tests'])
-        raise SystemExit(errno)
 
-
-def get_cfg_flags():
-    version = sys.version_info[0:2]
-    if version[0] == 2:
-        return ['--cfg=Py_2']
-    else:
-        return ['--cfg=Py_3']
-
-def get_features():
-    version = sys.version_info[0:2]
-    if version[0] == 2:
-        return ['numpy/python2']
-    else:
-        return ['numpy/python3']
+PYTHON_MAJOR_VERSION = sys.version_info[0]
 
 setup_requires = ['setuptools-rust>=0.6.0']
 install_requires = ['numpy']
@@ -39,13 +16,12 @@ def get_features():
     rust_extensions=[RustExtension(
         'rust_ext.rust_ext',
         './Cargo.toml',
-        rustc_flags=get_cfg_flags(),
-        features=get_features(),
+        rustc_flags=['--cfg=Py_{}'.format(PYTHON_MAJOR_VERSION)],
+        features=['numpy/python{}'.format(PYTHON_MAJOR_VERSION)],
     )],
     install_requires=install_requires,
     setup_requires=setup_requires,
     test_requires=test_requires,
     packages=find_packages(),
     zip_safe=False,
-    cmdclass=dict(test=PyTest)
 )

examples/simple-extension/tests/test_ext.py

@@ -1,6 +1,6 @@
 import numpy as np
 from rust_ext import axpy, mult
-import pytest
+
 
 def test_axpy():
     x = np.array([1.0, 2.0, 3.0])
@@ -12,8 +12,8 @@ def test_axpy():
     z = axpy(3.0, x, y)
     np.testing.assert_array_almost_equal(z, np.array([6.0, 9.0, 12.0, 15.0]))
 
+
 def test_mult():
     x = np.array([1.0, 2.0, 3.0])
     mult(3.0, x)
     np.testing.assert_array_almost_equal(x, np.array([3.0, 6.0, 9.0]))
-

examples/simple-extension/tox.ini

@@ -10,5 +10,4 @@ skip_missing_interpreters = true
 description = Run the unit tests under {basepython}
 deps = -rrequirements-dev.txt
 usedevelop = True
-commands = pip install -e .
-           pytest
+commands = pytest