Skip to content

Commit

Permalink
SpiceyPy 1.1.0
Browse files Browse the repository at this point in the history
* added wrapper functions and tests for a handful of functions (see changelog)
* Fixed Toolkit version to N65 pending new toolkit release.
* mostly automated artifact deployments to conda and pypi
* added changelog
* and more changes detailed somewhat in changelog
  • Loading branch information
AndrewAnnex committed Oct 19, 2016
1 parent c686c93 commit 52b4d65
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ after_success:
- coveralls
deploy:
provider: pypi
server: https://testpypi.python.org/pypi
user: andrewannex
password:
secure: NhCK6eiiqI0pF6I1mJAh0sWCmPk3bqzE/37cfqs3AZlrf/a30UjibXvcVKtpfINnujIe0FRJbU9JsxCgfoNMhHfymC3V4Br0ponT1P4w5IY0POVsoZIVdQn8Hn0EAOFu/nkD1LOGOkOcb/2M8UB6PJ0/x2znbVjpDh4L27zCQNI=
secure: YXA8LYIyAZ5HA2In4H/vUaCaVow9HbvKNT/TTT9OaH91Fszspr1uFo9mRQLNJlBViGgy2SaqNQITzlRdFyIcDstqRGPDQUw3xNIKvZ7YuHIzG1TVWNVpJsZf2ha1+JxozPTS2c2tlrS/LR7N4hYVtLOipaYAK2ucmB8sDu4dkws=
on:
tags: true
branch: master
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ 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]
## [1.1.0] - 2016-10-19
### Added
- wrapper functions and tests for fovray, fovtrg, pxfrm2, occult #158
- wrapper functions and tests for spklef, spkopa, spkpds, spksub, spkuds, spkuef #155
- tests for srxpt and sincpt #154
- a bunch of other tests for CK related functions
- example added to docs
- automated artifact deployments (mostly) to pypi and conda cloud
### Fixed
- improved use of six api to have better spicecells
### Changed
Expand Down
11 changes: 3 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ environment:
global:
WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\windows_sdk.cmd"
BINSTAR_TOKEN:
secure: fWe4otuWHdusx6FemAe47mLWoaDfuEthoKo5BpSlCIrmSVgOMX05ceuDgU3TlrfE
secure: 4g8YIaW6BcGaDKmgMsOWhySjKp18AHMtCNtzs7i8FN8FRfWswW3XFUVCec33pJwK
PYPI_PASSWORD:
secure: 1Azz/T29ed78wY4IFlTtyCRUavcANMDsZ5tDhNHk9Ys=
secure: ojP0ftEgmrZcijN49vQEPz39rkcPyOxtjwNp5hUYkdKxQq47DwkiaWOnVA11nog637VUmRnHb07uXwvrhK4bbg==

matrix:
- PYTHON: "C:\\Python27"
Expand Down Expand Up @@ -123,19 +123,14 @@ deploy_script:
- echo [distutils] > %USERPROFILE%\\.pypirc
- echo index-servers = >> %USERPROFILE%\\.pypirc
- echo pypi >> %USERPROFILE%\\.pypirc
- echo pypitest >> %USERPROFILE%\\.pypirc
- echo [pypitest] >> %USERPROFILE%\\.pypirc
- echo repository=https://testpypi.python.org/pypi >> %USERPROFILE%\\.pypirc
- echo username=andrewannex >> %USERPROFILE%\\.pypirc
- echo password=%PYPI_PASSWORD% >> %USERPROFILE%\\.pypirc
- echo [pypi] >> %USERPROFILE%\\.pypirc
- echo repository=https://pypi.python.org/pypi >> %USERPROFILE%\\.pypirc
- echo username=andrewannex >> %USERPROFILE%\\.pypirc
- echo password=%PYPI_PASSWORD% >> %USERPROFILE%\\.pypirc
# 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 -r pypitest --skip-existing dist/*" 2>$null } Else { write-output "Not on a tag on master, won't deploy to pypi"}
- ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload -r pypi --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
Expand Down
2 changes: 1 addition & 1 deletion appveyor/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: spiceypy
version: "1.1.0.dev2"
version: "1.1.0"

source:
path: ../
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ def __getattr__(cls, name):

# General information about the project.
project = 'SpiceyPy'
copyright = '2014, Andrew Annex'
copyright = '2014-2016, Andrew Annex'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.1.0.dev2'
version = '1.1.0'
# The full version, including alpha/beta/rc tags.
release = '1.1.0.dev2'
release = '1.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def windows_method():

setup(
name='spiceypy',
version='1.1.0.dev2',
version='1.1.0',
license='MIT',
author='Andrew Annex',
author_email='[email protected]',
Expand Down

0 comments on commit 52b4d65

Please sign in to comment.