updating things

appveyor.yml

@@ -102,12 +102,11 @@ artifacts:
 
 deploy_script:
   - echo "Starting Artifact Deployment"
-  # upload to pypi for windows, add back: 'if($env:appveyor_repo_tag -eq 'True' -and $env:appveyor_repo_branch -eq 'master')' for master brach, remove -r test also
-  - ps: Invoke-Expression "$env:PYTHON/Scripts/twine upload -u andrewannex -p %PYPI_PASSWORD% --repository-url https://testpypi.python.org/pypi/ --skip-existing dist/*"
+  # upload to pypi for windows
+  - If ($env:APPVEYOR_REPO_TAG -eq 'True' -and $env:APPVEYOR_REPO_BRANCH -eq 'master') { "%PYTHON%/Scripts/twine upload -u andrewannex -p %PYPI_PASSWORD% --repository-url https://testpypi.python.org/pypi/ --skip-existing dist/*" } Else { "Not a tag on master, won't deploy to pypi"}
   # upload conda builds to conda cloud
-  # If ($env:APPVEYOR_REPO_TAG -eq "true") { anaconda -t $env:BINSTAR_TOKEN upload ./win-*/*.tar.bz2 -u andrewannex --no-progress --force } Else { "Not on a tag, won't deploy" }
   - set PATH=%CONDA%;%CONDA%/Scripts;%CONDA%/Library/bin;%PATH%
-  - anaconda -t $env:BINSTAR_TOKEN upload ./win-*/*.tar.bz2 -u andrewannex --no-progress --force
+  - If ($env:APPVEYOR_REPO_TAG -eq "true" -and $env:APPVEYOR_REPO_BRANCH -eq 'master') { anaconda -t $env:BINSTAR_TOKEN upload ./win-*/*.tar.bz2 -u andrewannex --no-progress --force } Else { "Not on a tag on master, won't deploy to anaconda" }
   - set PATH=%BK_PATH%
   - echo "Finished Artifact Deployment"
 notifications: