Travis

natekupp · Dec 19, 2019 · 0d698d5 · 0d698d5
1 parent 79a5278
commit 0d698d5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,13 @@
 language: python
-
-matrix:
-  fast_finish: true
-  include:
-    - os: linux
-      dist: bionic
-      sudo: required
-      python: 3.7
-      env: PYVERSION="3"
-    - os: linux
-      dist: bionic
-      sudo: required
-      python: 3.6
-      env: PYVERSION="3"
-    - os: linux
-      dist: bionic
-      sudo: required
-      python: 3.5
-      env: PYVERSION="3"
-    - os: linux
-      dist: bionic
-      sudo: required
-      python: 2.7
-      env: PYVERSION=""
+python:
+  - "2.7"
+  - "3.5"
+  - "3.6"
+  - "3.7"
 
 install:
-  - pip${PYVERSION} install --upgrade pip setuptools wheel
-  - pip${PYVERSION} install coveralls codecov pytest-cov pytest
-  - pip${PYVERSION} install --only-binary=numpy,scipy scipy
-  - pip${PYVERSION} install scikit-learn
-  - pip${PYVERSION} install git+https://github.com/natekupp/ffx
+  - pip install -r dev-requirements.txt
+  - pip install -e .
 
 before_script:
   - export PYTHONPATH=$(pwd):$PYTHONPATH;

diff --git a/Makefile b/Makefile
@@ -14,3 +14,6 @@ pypi:
 	python setup.py sdist bdist_egg bdist_wheel
 	twine upload dist/*
 	#twine upload --repository-url https://test.pypi.org/legacy/ dist/* # testpypi
+
+test:
+	pytest ffx_tests/
diff --git a/setup.py b/setup.py
@@ -1,29 +1,28 @@
 from setuptools import setup
 
 setup(
-    name="ffx",
-    version="1.3.10",
-    author="Trent McConaghy",
-    author_email="gtrent@gmail.com",
-    maintainer="Nate Kupp",
-    maintainer_email="nathan.kupp@gmail.com",
+    name='ffx',
+    version='1.3.10',
+    author='Trent McConaghy',
+    author_email='gtrent@gmail.com',
+    maintainer='Nate Kupp',
+    maintainer_email='nathan.kupp@gmail.com',
     description=(
-        "Fast Function Extraction: A fast, scalable, and deterministic symbolic regression tool."
+        'Fast Function Extraction: A fast, scalable, and deterministic symbolic regression tool.'
     ),
-    license="See readme",
-    keywords="symbolic regression machine learning",
-    url="https://github.com/natekupp/ffx",
-    packages=['ffx', 'tests'],
+    license='See LICENSE',
+    keywords='symbolic regression machine learning',
+    url='https://github.com/natekupp/ffx',
+    packages=['ffx'],
     scripts=['ffx/bin/runffx'],
+    install_requires=['numpy', 'pandas', 'scipy', 'six', 'scikit-learn'],
     classifiers=[
-        "Development Status :: 4 - Beta",
-        "Environment :: Console",
-        "Intended Audience :: Developers",
-        "Topic :: Scientific/Engineering",
-        "License :: Other/Proprietary License",
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Topic :: Scientific/Engineering',
+        'License :: Other/Proprietary License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',