From c686c930d0ecb0d91d4eb4e93927dba0721af237 Mon Sep 17 00:00:00 2001 From: AndrewAnnex Date: Tue, 18 Oct 2016 23:15:07 -0400 Subject: [PATCH] trying to get appveyor pypi uploads to work --- appveyor.yml | 18 +++++++++++++++--- appveyor/meta.yaml | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5cdb8747..23341357 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ environment: secure: fWe4otuWHdusx6FemAe47mLWoaDfuEthoKo5BpSlCIrmSVgOMX05ceuDgU3TlrfE PYPI_PASSWORD: secure: 1Azz/T29ed78wY4IFlTtyCRUavcANMDsZ5tDhNHk9Ys= - PYPI_USERNAME: andrewannex matrix: - PYTHON: "C:\\Python27" @@ -120,10 +119,23 @@ artifacts: deploy_script: - echo "Starting Artifact Deployment" + # populate pypirc file for twine + - 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% - - ps: echo $null >> ~/.pypirc - - ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload -u andrewannex -p $env:PYPI_PASSWORD --repository pypitest --repository-url https://testpypi.python.org/pypi/ --skip-existing dist/*" 2>$null } Else { write-output "Not on a tag on master, won't deploy to pypi"} + - 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"} # 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 diff --git a/appveyor/meta.yaml b/appveyor/meta.yaml index 5b2acb0e..fcb1c719 100644 --- a/appveyor/meta.yaml +++ b/appveyor/meta.yaml @@ -1,6 +1,6 @@ package: name: spiceypy - version: "1.1.0.dev1" + version: "1.1.0.dev2" source: path: ../ diff --git a/docs/conf.py b/docs/conf.py index 25e6713b..6c120a73 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,9 +71,9 @@ def __getattr__(cls, name): # built documents. # # The short X.Y version. -version = '1.1.0.dev1' +version = '1.1.0.dev2' # The full version, including alpha/beta/rc tags. -release = '1.1.0.dev1' +release = '1.1.0.dev2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 5d7532f8..0a9287df 100644 --- a/setup.py +++ b/setup.py @@ -183,7 +183,7 @@ def windows_method(): setup( name='spiceypy', - version='1.1.0.dev1', + version='1.1.0.dev2', license='MIT', author='Andrew Annex', author_email='ama6fy@virginia.edu',