Skip to content

Commit

Permalink
switched to python 3.7 and removed non-essential installs
Browse files Browse the repository at this point in the history
  • Loading branch information
pauliacomi committed Dec 12, 2018
1 parent 85719ee commit a284e57
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ jobs:
include:
# Checks and docks
- stage: test
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env:
- TOXENV=check
- stage: test
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env:
- TOXENV=docs
addons:
Expand All @@ -88,7 +88,7 @@ jobs:
- TOXENV=py37-cover,report,codecov
# If all goes well, we want to deploy to PyPi
- stage: deploy
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env: TOXENV=none # overwrite environment var
install: skip # no need to install tox
script: skip # run no tests
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
"pointisotherm",
"scipy"
],
"coverage-gutters.xmlname": "coverage.xml"
"coverage-gutters.xmlname": "coverage.xml",
"python.pythonPath": "C:\\tools\\miniconda3\\envs\\py37\\python.exe"
}
18 changes: 13 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,21 @@ install:
- cmd: conda config --set always_yes yes --set changeps1 no
- cmd: conda update -q conda

# this is now the downloaded conda
# get the conda info
- cmd: conda info -a
- cmd: conda create -q -n testenv python=%PYTHON_VERSION% setuptools pip pytest>3.1 numpy pandas scipy matplotlib bokeh xlrd xlwt jinja2 nose

# install required packages
- cmd: conda create -q -n testenv python=%PYTHON_VERSION%
setuptools
pip
coverage
pytest>3.1
pytest-cov
numpy
pandas
scipy
matplotlib
- activate testenv
- pip install -U "pytest>=3.1.0" --ignore-installed
- pip install coverage
- pip install pytest-cov

# Now build the module
- '%WITH_COMPILER% pip install -ve .'
Expand Down
6 changes: 3 additions & 3 deletions ci/templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ jobs:
include:
# Checks and docks
- stage: test
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env:
- TOXENV=check
- stage: test
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env:
- TOXENV=docs
addons:
Expand All @@ -85,7 +85,7 @@ jobs:

# If all goes well, we want to deploy to PyPi
- stage: deploy
python: '3.6' # specify python 3.6
python: '3.7' # specify python 3.7
env: TOXENV=none # overwrite environment var
install: skip # no need to install tox
script: skip # run no tests
Expand Down
18 changes: 13 additions & 5 deletions ci/templates/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,21 @@ install:
- cmd: conda config --set always_yes yes --set changeps1 no
- cmd: conda update -q conda

# this is now the downloaded conda
# get the conda info
- cmd: conda info -a
- cmd: conda create -q -n testenv python=%PYTHON_VERSION% setuptools pip pytest>3.1 numpy pandas scipy matplotlib bokeh xlrd xlwt jinja2 nose

# install required packages
- cmd: conda create -q -n testenv python=%PYTHON_VERSION%
setuptools
pip
coverage
pytest>3.1
pytest-cov
numpy
pandas
scipy
matplotlib
- activate testenv
- pip install -U "pytest>=3.1.0" --ignore-installed
- pip install coverage
- pip install pytest-cov

# Now build the module
- '%WITH_COMPILER% pip install -ve .'
Expand Down

0 comments on commit a284e57

Please sign in to comment.