Skip to content

Commit 632271e

Browse files
authored
Removed anaconda build steps from appveyor as conda-forge distribut… (#270)
Removed anaconda build steps from appveyor as conda-forge distribution is mature enough now, * also simplifies appveyor builds * added 3.7 python builds to appveyor and travis ci services * fixed typo in change log date for 2.1.2
1 parent 621b568 commit 632271e

8 files changed

Lines changed: 23 additions & 205 deletions

File tree

‎.travis.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ sudo: false
33
matrix:
44
include:
55
- os: linux
6-
dist: trusty
76
python: 2.7
87
- os: linux
9-
dist: trusty
108
python: 3.5
119
- os: linux
12-
dist: trusty
1310
python: 3.6
11+
- os: linux
12+
python: 3.7
13+
sudo: true
14+
dist: xenial
1415
- os: osx
1516
language: generic
1617
env: PYVERSION='2.7.13'
@@ -20,6 +21,9 @@ matrix:
2021
- os: osx
2122
language: generic
2223
env: PYVERSION='3.6.0'
24+
- os: osx
25+
language: generic
26+
env: PYVERSION='3.7.0'
2327

2428
before_install:
2529
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ All notable changes to SpiceyPy will be documented here
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project tries to adhere to [Semantic Versioning](http://semver.org/).
66

7-
## [2.1.2] - 20128-06-17
7+
## [2.1.2] - 2018-08-17
8+
### Added
9+
- python 3.7 builds on travis / appveyor
10+
811
### Changed
912
- numpy to ctypes and back conversions improved
13+
1014
### Removed
1115
- a few bool related internal things in support_types
16+
- conda builds on appveyor removed in favor of conda-forge distribution of spiceypy
17+
1218
### Fixed
1319
- issues relating to c_bool usage. everything is now c_int
1420

‎appveyor.yml‎

Lines changed: 9 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,37 @@ build: off
77
environment:
88
global:
99
WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd"
10-
BINSTAR_TOKEN:
11-
secure: 1p91Qkglb6onbHoG+cyOCG7pZ3Zq/CNjR/FydK2GOnPrVHiD3TExMmHR8PXk7X6F
1210
PYPI_PASSWORD:
1311
secure: ojP0ftEgmrZcijN49vQEPz39rkcPyOxtjwNp5hUYkdKxQq47DwkiaWOnVA11nog637VUmRnHb07uXwvrhK4bbg==
1412

1513
matrix:
1614
- PYTHON: "C:\\Python27-x64"
17-
CONDA: "C:\\Miniconda-x64"
18-
CONDA_BUILDS: C:\\Miniconda-x64\conda-bld\win-64
1915
PYTHON_VERSION: "2.7.x"
2016
ARCH: "64"
2117
PLAT_NAME: "win-amd64"
2218
PY_TAG: "cp27"
2319

2420
- PYTHON: "C:\\Python35-x64"
25-
CONDA: "C:\\Miniconda35-x64"
26-
CONDA_BUILDS: C:\\Miniconda35-x64\conda-bld\win-64
2721
PYTHON_VERSION: "3.5.x"
2822
ARCH: "64"
2923
WINDOWS_SDK_VERSION: "v7.1"
3024
PLAT_NAME: "win-amd64"
3125
PY_TAG: "cp35"
3226

3327
- PYTHON: "C:\\Python36-x64"
34-
CONDA: "C:\\Miniconda36-x64"
35-
CONDA_BUILDS: C:\\Miniconda36-x64\conda-bld\win-64
3628
PYTHON_VERSION: "3.6.x"
3729
ARCH: "64"
3830
WINDOWS_SDK_VERSION: "v7.1"
3931
PLAT_NAME: "win-amd64"
4032
PY_TAG: "cp36"
4133

34+
- PYTHON: "C:\\Python37-x64"
35+
PYTHON_VERSION: "3.7.x"
36+
ARCH: "64"
37+
WINDOWS_SDK_VERSION: "v7.1"
38+
PLAT_NAME: "win-amd64"
39+
PY_TAG: "cp37"
40+
4241
platform:
4342
- x64
4443

@@ -54,28 +53,14 @@ install:
5453

5554
# Download things we absolutely need
5655
- pip install wheel twine six pytest
57-
# coveralls and or coverage fail to install for 3.4 64bit python builds so don't bother for now.
58-
59-
# Check for numpy wheel, compile if absent
60-
- "powershell appveyor\\install_numpy.ps1"
61-
62-
# Now install numpy from pre-built wheel. This may be fragile.
63-
- "%WITH_COMPILER% pip install --no-index --find-links=c:\\Users\\appveyor\\Downloads numpy"
64-
65-
# Download CSPICE so we can build outside of python
66-
- "%PYTHON%/python getspice.py"
67-
68-
# Make a backup of the PATH just in case.
69-
- set BK_PATH=%PATH%
56+
- pip install numpy
7057

7158
# Now install spiceypy
7259
- IF "%ARCH%"=="32" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86) ELSE (ECHO "probably a 64bit build")
7360
- IF "%ARCH%"=="64" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64) ELSE (ECHO "probably a 32bit build")
7461
- "%PYTHON%/python setup.py install"
7562

7663
- ECHO "Installed SpiceyPy!"
77-
# restore PATH
78-
- set PATH=%BK_PATH%
7964
- "%PYTHON%/Scripts/py.test --version"
8065

8166
test_script:
@@ -85,43 +70,12 @@ after_test:
8570
- ECHO "DONE!"
8671
- ECHO "BUILDING WHEELS..."
8772
- "%PYTHON%/python setup.py sdist bdist_wheel --plat-name=%PLAT_NAME% --python-tag=%PY_TAG%"
88-
- ECHO "BUILDING CONDA PACKAGE..."
89-
- set BK_PATH=%PATH%
90-
91-
# try conda thing
92-
- set PATH=%CONDA%;%CONDA%/Scripts;%CONDA%/Library/bin;%PATH%
93-
# make sure python now maps to miniconda
94-
#- cmd: call %CONDA%\Scripts\activate.bat
95-
# from conda-forge
96-
- cmd: rmdir C:\cygwin /s /q
97-
# from conda-forge
98-
- "conda config --set show_channel_urls true"
99-
# from conda-forge
100-
- "appveyor-retry conda install --yes --quiet conda>=4.3.30"
101-
- "appveyor-retry conda install --yes --quiet conda-build"
102-
- "appveyor-retry conda install --yes --quiet wheel"
103-
- "appveyor-retry conda install --yes --quiet six"
104-
- "appveyor-retry conda install --yes --quiet pytest"
105-
- "appveyor-retry conda install --yes --quiet numpy>=1.12"
106-
- "appveyor-retry conda install --yes --quiet anaconda-client"
107-
- "conda config --add channels conda-forge"
108-
- "conda config --set channel_priority false"
109-
- "appveyor-retry conda install -q -y certifi>=2017.1.23"
110-
# build spiceypy
111-
- "conda build appveyor -q --no-anaconda-upload"
112-
- ps: ls $env:CONDA_BUILDS
113-
- ps: mv $env:CONDA_BUILDS ./
11473
- ps: rm dist/*.egg
115-
- set PATH=%BK_PATH%
116-
11774

11875
artifacts:
11976
- path: dist\*
12077
name: pypiartifacts
12178

122-
- path: 'win-*\*.tar.bz2'
123-
name: condaartifacts
124-
12579
deploy_script:
12680
- echo "Starting Artifact Deployment"
12781
# populate pypirc file for twine
@@ -134,12 +88,7 @@ deploy_script:
13488
# upload to pypi for windows
13589
- set PATH=%BK_PATH%
13690
- set HOME=%USERPROFILE%
137-
- ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload --skip-existing dist/*" 2>$null } Else { write-output "Not on a tag on master, won't deploy to pypi"}
138-
# upload conda builds to conda cloud
139-
- cmd: set PATH=%CONDA%;%CONDA%/Scripts;%CONDA%/Library/bin;%PATH%
140-
# because appveyor prints to stderror, we will run it in command mode by doing a check firs
141-
- ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { $env:conda_upload = 'true' } Else { write-output "Not on a tag on master, won't deploy to anaconda" }
142-
- cmd: IF "%conda_upload%"=="true" anaconda -t %BINSTAR_TOKEN% upload .\win-*\*.tar.bz2 -u andrewannex --no-progress --force
91+
- ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload --skip-existing dist/*.whl" 2>$null } Else { write-output "Not on a tag on master, won't deploy to pypi"}
14392
- echo "Finished Artifact Deployment"
14493
notifications:
14594
- provider: Webhook

‎appveyor/bld.bat‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎appveyor/build.sh‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎appveyor/install_numpy.ps1‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎appveyor/meta.yaml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎appveyor/windows_sdk.cmd‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)