Skip to content

Commit 839e8d5

Browse files
authored
Merge pull request #10 from mwcraig/remove-3.5-ci
Remove python 3.5 builds from all platforms
2 parents 7a5aad2 + 4f687c6 commit 839e8d5

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ env:
1414
- CONDA_INSTALL_LOCN="${HOME}/miniconda"
1515
- TWINE_USERNAME="mwcraig"
1616
matrix:
17-
- CONDA_PY=3.5
1817
- CONDA_PY=3.6
1918
- CONDA_PY=3.7
2019

@@ -47,7 +46,7 @@ script:
4746
# This should prevent spurious failures at the deploy stage.
4847
- export UPLOAD_SDIST="NO"
4948
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
50-
if [ "$CONDA_PY" == "3.6" ]; then
49+
if [ "$CONDA_PY" == "3.7" ]; then
5150
export UPLOAD_SDIST="YES";
5251
fi
5352
fi

appveyor.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ environment:
44
# Install appropriate conda here based on TARGET_ARCH
55
CONDA_INSTALL_LOCN: "C:\\conda"
66

7-
CONDA_VERSION_PIN: "4.5"
7+
CONDA_VERSION_PIN: ""
88
TQDM_PIN: ""
99

1010
# These installs are needed on windows but not other platforms.
@@ -30,13 +30,6 @@ environment:
3030
- TARGET_ARCH: "x64"
3131
CONDA_PY: "3.6"
3232
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
33-
- TARGET_ARCH: "x64"
34-
CONDA_PY: "3.5"
35-
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
36-
# Need to pin this on python 35 for reasons unfathomable to me (well,
37-
# probably related to the fact that tqdm 4.29.0 is noarch, and
38-
# conda 3.5.11 doesn't handle that well, maybe)
39-
TQDM_PIN: "=4.26"
4033

4134
# 32-bit builds
4235
- TARGET_ARCH: "x86"
@@ -45,13 +38,6 @@ environment:
4538
- TARGET_ARCH: "x86"
4639
CONDA_PY: "3.6"
4740
CONDA_INSTALL_LOCN: "C:\\Miniconda36"
48-
- TARGET_ARCH: "x86"
49-
CONDA_PY: "3.5"
50-
CONDA_INSTALL_LOCN: "C:\\Miniconda35"
51-
# Need to pin this on python 35 for reasons unfathomable to me (well,
52-
# probably related to the fact that tqdm 4.29.0 is noarch, and
53-
# conda 3.5.11 doesn't handle that well, maybe)
54-
TQDM_PIN: "=4.26"
5541

5642
# We always use a 64-bit machine, but can build x86 distributions
5743
# with the TARGET_ARCH variable.
@@ -81,10 +67,11 @@ install:
8167
# - cmd: conda update --quiet conda python
8268

8369
- echo %CONDA_PY%
70+
- conda update --quiet conda
8471
# Need to do this to pick up newer versions of conda
8572
- if "%CONDA_PY%"=="3.5" conda update --quiet conda
8673

87-
- cmd: conda install --quiet conda=%CONDA_VERSION_PIN% jinja2 conda-build anaconda-client cython wheel %INSTALL_ON_WINDOWS% tqdm%TQDM_PIN%
74+
- cmd: conda install --quiet conda%CONDA_VERSION_PIN% jinja2 conda-build anaconda-client cython wheel %INSTALL_ON_WINDOWS% tqdm%TQDM_PIN%
8875

8976
#- conda create --quiet -n wheel-build python=%CONDA_PY% wheel cython
9077
- conda info -a

0 commit comments

Comments
 (0)