Skip to content

Commit f112d73

Browse files
author
Allen Riddell
committed
Merge branch 'feature/appveyor-py35' into develop
2 parents 8355b34 + 56451f4 commit f112d73

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

appveyor.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,6 @@ environment:
5656
PYTHON_VERSION: "3.5.x"
5757
PYTHON_ARCH: "64"
5858

59-
# Major and minor releases (i.e x.0.0 and x.y.0) prior to 3.3.0 use
60-
# a different naming scheme.
61-
62-
- PYTHON: "C:\\Python270"
63-
PYTHON_VERSION: "2.7.0"
64-
PYTHON_ARCH: "32"
65-
66-
- PYTHON: "C:\\Python270-x64"
67-
PYTHON_VERSION: "2.7.0"
68-
PYTHON_ARCH: "64"
69-
7059
install:
7160
- ECHO "Filesystem root:"
7261
- ps: "ls \"C:/\""
@@ -133,4 +122,4 @@ on_success:
133122
# Upload the generated wheel package to Rackspace
134123
# On Windows, Apache Libcloud cannot find a standard CA cert bundle so we
135124
# disable the ssl checks.
136-
- "python -m wheelhouse_uploader upload --no-ssl-check --region=iad --local-folder=dist wheels"
125+
- IF %APPVEYOR_REPO_TAG% == true ( "python -m wheelhouse_uploader upload --no-ssl-check --region=iad --local-folder=dist wheels" )

continuous_integration/appveyor/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
# fix the versions of numpy to force the use the whl in the rackspace folder
99
# instead of trying to install from more recent source tarball published on PyPI
10-
numpy==1.8.2
11-
scipy==0.14.0
10+
numpy==1.9.3
11+
scipy==0.16.1
1212
nose
1313
wheel
1414
wheelhouse_uploader>=0.5,<1.0

0 commit comments

Comments
 (0)