Skip to content

Commit

Permalink
made numpy version more forgiving for travis builds, removed activate…
Browse files Browse the repository at this point in the history
… call as so far all I can tell it did was break 34 builds, but it may still be needed in which case an if will be needed
  • Loading branch information
AndrewAnnex committed Oct 30, 2017
1 parent 5cabed6 commit 5317b1a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -100,7 +100,7 @@ after_test:
# try conda thing
- set PATH=%CONDA%;%CONDA%/Scripts;%CONDA%/Library/bin;%PATH%
# make sure python now maps to miniconda
- cmd: call %CONDA%\Scripts\activate.bat
#- cmd: call %CONDA%\Scripts\activate.bat
# from conda-forge
- cmd: rmdir C:\cygwin /s /q
# from conda-forge
Expand All @@ -111,7 +111,7 @@ after_test:
- "appveyor-retry conda install --yes --quiet wheel"
- "appveyor-retry conda install --yes --quiet six"
- "appveyor-retry conda install --yes --quiet pytest"
- "appveyor-retry conda install --yes --quiet numpy>=1.13"
- "appveyor-retry conda install --yes --quiet numpy>=1.12"
- "appveyor-retry conda install --yes --quiet anaconda-client"
- "conda config --add channels conda-forge"
- "conda config --set channel_priority false"
Expand Down
6 changes: 3 additions & 3 deletions appveyor/meta.yaml
Expand Up @@ -13,22 +13,22 @@ requirements:
- python
- setuptools
- six
- numpy >=1.13
- numpy >=1.12
- certifi >=2017.1.23
- pytest
run:
- python
- setuptools
- six
- numpy >=1.13
- numpy >=1.12
- certifi >=2017.1.23
- pytest

test:
imports:
- spiceypy
requires:
- numpy >=1.13
- numpy >=1.12
- pytest
- six
- certifi >=2017.1.23
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -47,8 +47,8 @@
# Make the directory path for cspice/lib
lib_dir = os.path.join(cspice_dir, 'lib')

TEST_DEPENDENCIES = ['numpy>=1.13.0', 'six>=1.9.0', 'pytest>=2.9.0']
DEPENDENCIES = ['numpy>=1.13.0', 'six>=1.9.0', 'certifi>=2017.1.23']
TEST_DEPENDENCIES = ['numpy>=1.12.0', 'six>=1.9.0', 'pytest>=2.9.0']
DEPENDENCIES = ['numpy>=1.12.0', 'six>=1.9.0', 'certifi>=2017.1.23']
REQUIRES = ['numpy', 'six']

# If we have an old version of OpenSSL, CSPICE will be downloaded
Expand Down

0 comments on commit 5317b1a

Please sign in to comment.