From 9a742f6c42d496897478dec00f9da5f115083b48 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 17:22:54 -0700 Subject: [PATCH 1/8] Update .travis.yml trying a few things, including switching to `nosetests` syntax --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfbd0c2..47f425d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,9 @@ before_install: install: - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION - source activate test - - conda install --yes numpy scipy matplotlib pip nose - - pip install setuptools - - python setup.py install + #- conda install --yes numpy scipy matplotlib pip nose +# - pip install setuptools + - pip install pytest + - pip install . -script: python test.py +script: nosetests From f611472f219a7f702cbde9c8442f515f7cbb7d40 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 17:23:45 -0700 Subject: [PATCH 2/8] Update setup.py switch to pytest --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a95dd45..040670e 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def readme(): 'scipy >= 0.15.0', 'matplotlib' ], - test_suite='nose.collector', - tests_require=['nose'], + test_suite='pytest', + tests_require=['pytest'], include_package_data=True, zip_safe=False) From 48f1a12bd4c73e7a400fc1b486a2d6c135713c6f Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 17:24:20 -0700 Subject: [PATCH 3/8] Update .travis.yml remove pytest install in hopes that pip catches it. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47f425d..0040099 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ install: - source activate test #- conda install --yes numpy scipy matplotlib pip nose # - pip install setuptools - - pip install pytest - pip install . script: nosetests From c21b32e405188237150fe40ddef33b899175f063 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 17:54:15 -0700 Subject: [PATCH 4/8] version lock scipy scipy doesn't work for 2.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 040670e..b71913f 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def readme(): packages=['active_subspaces', 'active_subspaces.utils'], install_requires=[ 'numpy', - 'scipy >= 0.15.0', + 'scipy >= 0.15.0,<1.2.2', 'matplotlib' ], test_suite='pytest', From 4d2509155da21ac70f46b90aae90c638018f461c Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 17:59:14 -0700 Subject: [PATCH 5/8] Update .travis.yml pytest and agg backend --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0040099..16dcd15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,6 @@ install: #- conda install --yes numpy scipy matplotlib pip nose # - pip install setuptools - pip install . + - export MPLBACKEND="Agg" -script: nosetests +script: pytest From 28c0096b0a2605125e4b17d50214c489e0207644 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 18:41:41 -0700 Subject: [PATCH 6/8] Update .travis.yml back to nosetests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16dcd15..2051d9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,4 @@ install: - pip install . - export MPLBACKEND="Agg" -script: pytest +script: nosetests From d37c79400c65d45c93972e00c099ebdcb7c060b7 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Mon, 18 Nov 2019 18:42:28 -0700 Subject: [PATCH 7/8] Update setup.py back to nosetests --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b71913f..7ea8ef1 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def readme(): 'scipy >= 0.15.0,<1.2.2', 'matplotlib' ], - test_suite='pytest', - tests_require=['pytest'], + test_suite='nose.collector', + tests_require=['nose'], include_package_data=True, zip_safe=False) From 18d0ea8838d2ef56d15870c81a21d37319d317e1 Mon Sep 17 00:00:00 2001 From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com> Date: Tue, 19 Nov 2019 15:07:49 -0700 Subject: [PATCH 8/8] Update .travis.yml looks like not having conda install pip was an issue (the pip that was being called was the "wrong one") Let's try to do this _without_ conda. Travis has its own system python versions cached anyway, so it should expedite tests a bit too. --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2051d9e..1774596 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,15 @@ addons: - liblapack-dev before_install: - - travis_retry wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh - - chmod +x miniconda.sh - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH=/home/travis/miniconda/bin:$PATH - - conda update --yes conda + - #travis_retry wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh + - #chmod +x miniconda.sh + - #bash miniconda.sh -b -p $HOME/miniconda + - #export PATH=/home/travis/miniconda/bin:$PATH + - #conda update --yes conda install: - - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION - - source activate test + #- conda create --yes -n test python=$TRAVIS_PYTHON_VERSION + #- source activate test #- conda install --yes numpy scipy matplotlib pip nose # - pip install setuptools - pip install .