Merge f682775 into 621b568

.travis.yml

@@ -3,14 +3,15 @@ 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
+          python: 3.7
+          sudo: true
+          dist: xenial
         - os: osx
           language: generic
           env: PYVERSION='2.7.13'
@@ -20,6 +21,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

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

appveyor.yml

@@ -7,38 +7,37 @@ 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"
         PLAT_NAME: "win-amd64"
         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,14 @@ 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"
-
-  # 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%
+  - pip install numpy
 
   # 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 +70,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 +88,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