From 82bd9e07f0d027de14ca08bdc402c04a6417c6e1 Mon Sep 17 00:00:00 2001 From: AndrewAnnex Date: Mon, 13 Aug 2018 13:50:11 -0400 Subject: [PATCH 1/4] * 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 * need to sort out symantic version bump for this change --- .travis.yml | 6 ++++ CHANGELOG.md | 8 ++++- appveyor.yml | 66 ++++++-------------------------------- appveyor/bld.bat | 23 ------------- appveyor/build.sh | 9 ------ appveyor/install_numpy.ps1 | 19 ----------- appveyor/meta.yaml | 43 ------------------------- 7 files changed, 22 insertions(+), 152 deletions(-) delete mode 100755 appveyor/bld.bat delete mode 100644 appveyor/build.sh delete mode 100644 appveyor/install_numpy.ps1 delete mode 100644 appveyor/meta.yaml diff --git a/.travis.yml b/.travis.yml index 940d91b6..eb1b5bd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ matrix: - os: linux dist: trusty python: 3.6 + - os: linux + dist: trusty + python: 3.7 - os: osx language: generic env: PYVERSION='2.7.13' @@ -20,6 +23,9 @@ matrix: - os: osx language: generic env: PYVERSION='3.6.0' + - os: osx + language: generic + env: PYVERSION='3.7.0' before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 9440b8ed..529cf897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ All notable changes to SpiceyPy will be documented here The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project tries to adhere to [Semantic Versioning](http://semver.org/). -## [2.1.2] - 20128-06-17 +## [???] - UNRELEASED +### Added +- python 3.7 builds on travis / appveyor +### Removed +- conda builds on appveyor removed in favor of conda-forge distribution of spiceypy + +## [2.1.2] - 2018-06-17 ### Changed - numpy to ctypes and back conversions improved ### Removed diff --git a/appveyor.yml b/appveyor.yml index 86d58c29..c9fc2635 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,23 +7,17 @@ build: off environment: global: WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd" - BINSTAR_TOKEN: - secure: 1p91Qkglb6onbHoG+cyOCG7pZ3Zq/CNjR/FydK2GOnPrVHiD3TExMmHR8PXk7X6F PYPI_PASSWORD: secure: ojP0ftEgmrZcijN49vQEPz39rkcPyOxtjwNp5hUYkdKxQq47DwkiaWOnVA11nog637VUmRnHb07uXwvrhK4bbg== matrix: - PYTHON: "C:\\Python27-x64" - CONDA: "C:\\Miniconda-x64" - CONDA_BUILDS: C:\\Miniconda-x64\conda-bld\win-64 PYTHON_VERSION: "2.7.x" ARCH: "64" PLAT_NAME: "win-amd64" PY_TAG: "cp27" - PYTHON: "C:\\Python35-x64" - CONDA: "C:\\Miniconda35-x64" - CONDA_BUILDS: C:\\Miniconda35-x64\conda-bld\win-64 PYTHON_VERSION: "3.5.x" ARCH: "64" WINDOWS_SDK_VERSION: "v7.1" @@ -31,14 +25,19 @@ environment: PY_TAG: "cp35" - PYTHON: "C:\\Python36-x64" - CONDA: "C:\\Miniconda36-x64" - CONDA_BUILDS: C:\\Miniconda36-x64\conda-bld\win-64 PYTHON_VERSION: "3.6.x" ARCH: "64" WINDOWS_SDK_VERSION: "v7.1" PLAT_NAME: "win-amd64" PY_TAG: "cp36" + - PYTHON: "C:\\Python37-x64" + PYTHON_VERSION: "3.7.x" + ARCH: "64" + WINDOWS_SDK_VERSION: "v7.1" + PLAT_NAME: "win-amd64" + PY_TAG: "cp37" + platform: - x64 @@ -54,28 +53,17 @@ install: # Download things we absolutely need - pip install wheel twine six pytest - # coveralls and or coverage fail to install for 3.4 64bit python builds so don't bother for now. - - # Check for numpy wheel, compile if absent - - "powershell appveyor\\install_numpy.ps1" - - # Now install numpy from pre-built wheel. This may be fragile. - - "%WITH_COMPILER% pip install --no-index --find-links=c:\\Users\\appveyor\\Downloads numpy" + - pip install numpy # Download CSPICE so we can build outside of python - "%PYTHON%/python getspice.py" - # Make a backup of the PATH just in case. - - set BK_PATH=%PATH% - # Now install spiceypy - IF "%ARCH%"=="32" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86) ELSE (ECHO "probably a 64bit build") - IF "%ARCH%"=="64" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64) ELSE (ECHO "probably a 32bit build") - "%PYTHON%/python setup.py install" - ECHO "Installed SpiceyPy!" - # restore PATH - - set PATH=%BK_PATH% - "%PYTHON%/Scripts/py.test --version" test_script: @@ -85,43 +73,12 @@ after_test: - ECHO "DONE!" - ECHO "BUILDING WHEELS..." - "%PYTHON%/python setup.py sdist bdist_wheel --plat-name=%PLAT_NAME% --python-tag=%PY_TAG%" - - ECHO "BUILDING CONDA PACKAGE..." - - set BK_PATH=%PATH% - - # 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 - # from conda-forge - - cmd: rmdir C:\cygwin /s /q - # from conda-forge - - "conda config --set show_channel_urls true" - # from conda-forge - - "appveyor-retry conda install --yes --quiet conda>=4.3.30" - - "appveyor-retry conda install --yes --quiet conda-build" - - "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.12" - - "appveyor-retry conda install --yes --quiet anaconda-client" - - "conda config --add channels conda-forge" - - "conda config --set channel_priority false" - - "appveyor-retry conda install -q -y certifi>=2017.1.23" - # build spiceypy - - "conda build appveyor -q --no-anaconda-upload" - - ps: ls $env:CONDA_BUILDS - - ps: mv $env:CONDA_BUILDS ./ - ps: rm dist/*.egg - - set PATH=%BK_PATH% - artifacts: - path: dist\* name: pypiartifacts - - path: 'win-*\*.tar.bz2' - name: condaartifacts - deploy_script: - echo "Starting Artifact Deployment" # populate pypirc file for twine @@ -134,12 +91,7 @@ deploy_script: # upload to pypi for windows - set PATH=%BK_PATH% - set HOME=%USERPROFILE% - - 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"} - # upload conda builds to conda cloud - - cmd: set PATH=%CONDA%;%CONDA%/Scripts;%CONDA%/Library/bin;%PATH% - # because appveyor prints to stderror, we will run it in command mode by doing a check firs - - 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" } - - cmd: IF "%conda_upload%"=="true" anaconda -t %BINSTAR_TOKEN% upload .\win-*\*.tar.bz2 -u andrewannex --no-progress --force + - 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"} - echo "Finished Artifact Deployment" notifications: - provider: Webhook diff --git a/appveyor/bld.bat b/appveyor/bld.bat deleted file mode 100755 index bc272de5..00000000 --- a/appveyor/bld.bat +++ /dev/null @@ -1,23 +0,0 @@ -IF DEFINED DevEnvDir ( - ECHO "vcvarall.bat has been called" -) ELSE ( - IF "%ARCH%"=="32" ( - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 - ) ELSE ( - ECHO "probably a 64bit build" - ) - IF "%ARCH%"=="64" ( - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 - ) ELSE ( - ECHO "probably a 32bit build" - ) -) - -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 - -:: Add more build steps here, if they are necessary. - -:: See -:: http://docs.continuum.io/conda/build.html -:: for a list of environment variables that are set during the build process. diff --git a/appveyor/build.sh b/appveyor/build.sh deleted file mode 100644 index 4d7fc032..00000000 --- a/appveyor/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install - -# Add more build steps here, if they are necessary. - -# See -# http://docs.continuum.io/conda/build.html -# for a list of environment variables that are set during the build process. diff --git a/appveyor/install_numpy.ps1 b/appveyor/install_numpy.ps1 deleted file mode 100644 index 1c177a9f..00000000 --- a/appveyor/install_numpy.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -#contents of install_numpy.ps1 - -function main (){ - if (-not(Test-Path "C:\Users\appveyor\Downloads\*.whl")) { - Write-Host "numpy has not been compiled yet. Starting Long process..." - Write-Host "pip wheel --wheel-dir=c:\Users\appveyor\Downloads numpy" - iex "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd pip wheel --wheel-dir=c:\\Users\\appveyor\\Downloads numpy" - } else { - Write-Host "numpy has already been compiled." - $numpywheel = Get-ChildItem "C:\Users\appveyor\Downloads\*.whl" - Write-Host "$numpywheel" - $numpypath = $numpywheel.FullName - Write-Host "$numpypath" - iex "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd pip install $numpypath" -Verbose - iex "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd pip list" - } -} - -main \ No newline at end of file diff --git a/appveyor/meta.yaml b/appveyor/meta.yaml deleted file mode 100644 index 46506a7c..00000000 --- a/appveyor/meta.yaml +++ /dev/null @@ -1,43 +0,0 @@ -package: - name: spiceypy - version: "2.1.2" - -source: - path: ../ - -build: - number: 1 - -requirements: - build: - - python - - setuptools - - six - - numpy >=1.12 - - certifi >=2017.1.23 - - pytest - run: - - python - - setuptools - - six - - numpy >=1.12 - - certifi >=2017.1.23 - - pytest - -test: - imports: - - spiceypy - requires: - - numpy >=1.12 - - pytest - - six - - certifi >=2017.1.23 - -about: - home: https://github.com/AndrewAnnex/SpiceyPy - license: MIT License - summary: 'A Python Wrapper for the NAIF CSPICE Toolkit' - -# See -# http://docs.continuum.io/conda/build.html for -# more information about meta.yaml \ No newline at end of file From 7baf9f549c315bfc5d947818f7f3daf9760108ca Mon Sep 17 00:00:00 2001 From: AndrewAnnex Date: Mon, 13 Aug 2018 14:16:10 -0400 Subject: [PATCH 2/4] * further simplified appveyor build * travis ci is having issues with using 3.7 not sure why yet --- .travis.yml | 4 ---- appveyor.yml | 3 --- appveyor/windows_sdk.cmd | 47 ---------------------------------------- 3 files changed, 54 deletions(-) delete mode 100644 appveyor/windows_sdk.cmd diff --git a/.travis.yml b/.travis.yml index eb1b5bd4..793bfff2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,12 @@ sudo: false matrix: include: - os: linux - dist: trusty python: 2.7 - os: linux - dist: trusty python: 3.5 - os: linux - dist: trusty python: 3.6 - os: linux - dist: trusty python: 3.7 - os: osx language: generic diff --git a/appveyor.yml b/appveyor.yml index c9fc2635..08b3d6a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,9 +55,6 @@ install: - pip install wheel twine six pytest - pip install numpy - # Download CSPICE so we can build outside of python - - "%PYTHON%/python getspice.py" - # Now install spiceypy - IF "%ARCH%"=="32" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86) ELSE (ECHO "probably a 64bit build") - IF "%ARCH%"=="64" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64) ELSE (ECHO "probably a 32bit build") diff --git a/appveyor/windows_sdk.cmd b/appveyor/windows_sdk.cmd deleted file mode 100644 index 33f0a6eb..00000000 --- a/appveyor/windows_sdk.cmd +++ /dev/null @@ -1,47 +0,0 @@ -:: To build extensions for 64 bit Python 3, we need to configure environment -:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1) -:: -:: To build extensions for 64 bit Python 2, we need to configure environment -:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0) -:: -:: 32 bit builds do not require specific environment configurations. -:: -:: Note: this script needs to be run with the /E:ON and /V:ON flags for the -:: cmd interpreter, at least for (SDK v7.0) -:: -:: More details at: -:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows -:: http://stackoverflow.com/a/13751649/163740 -:: -:: Author: Olivier Grisel -:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ -@ECHO OFF - -SET COMMAND_TO_RUN=%* -SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows - -SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%" -IF %MAJOR_PYTHON_VERSION% == "2" ( - SET WINDOWS_SDK_VERSION="v7.0" -) ELSE IF %MAJOR_PYTHON_VERSION% == "3" ( - SET WINDOWS_SDK_VERSION="v7.1" -) ELSE ( - ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%" - EXIT 1 -) - -IF "%PYTHON_ARCH%"=="64" ( - ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture - SET DISTUTILS_USE_SDK=1 - SET MSSdk=1 - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -) ELSE ( - ECHO Using default MSVC build environment for 32 bit architecture - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -) \ No newline at end of file From f6827755e63d6c9c490a3f7015ccb53e1bce078e Mon Sep 17 00:00:00 2001 From: AndrewAnnex Date: Tue, 21 Aug 2018 10:19:20 -0400 Subject: [PATCH 3/4] trying to just enable xenial build on linux 3.7 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 793bfff2..a6a0885b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ matrix: python: 3.6 - os: linux python: 3.7 + sudo: true + dist: xenial - os: osx language: generic env: PYVERSION='2.7.13' From 3588d37b34533ade7a071a57c827312bc9dba018 Mon Sep 17 00:00:00 2001 From: AndrewAnnex Date: Tue, 21 Aug 2018 11:05:02 -0400 Subject: [PATCH 4/4] fixing chnagelog formatting, no symver bump as no api changes or bug fixes occured --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529cf897..eaec062c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,17 +4,17 @@ All notable changes to SpiceyPy will be documented here The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project tries to adhere to [Semantic Versioning](http://semver.org/). -## [???] - UNRELEASED +## [2.1.2] - 2018-08-17 ### Added - python 3.7 builds on travis / appveyor -### Removed -- conda builds on appveyor removed in favor of conda-forge distribution of spiceypy -## [2.1.2] - 2018-06-17 ### Changed - numpy to ctypes and back conversions improved + ### Removed - a few bool related internal things in support_types +- conda builds on appveyor removed in favor of conda-forge distribution of spiceypy + ### Fixed - issues relating to c_bool usage. everything is now c_int