Finalized deploy

sharppy · Dec 21, 2018 · 4ec47b5 · 4ec47b5
1 parent 48dd6c9
commit 4ec47b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,30 +53,30 @@ deploy:
      tags: true
      branch: andover
 # Deploy the code to PyPI
-# - provider: pypi
-#   user: sharppy
-#   password:
-#     secure: "qgE7Hef6m9m6xf0CU976z/7KbpSaRIeucwVztsJQQCqP97FMnkb0bL0fhQMoxkVti1VCAuF9FXvWzWBKuKeu+sqP3pEE7GYlTVqq4kN3W55DleVFbyWy3Fyhu+6pRJL168kZg1rCNboX7Xw8RwI0l0r3DiSvjqWSYvOfdabgYlECImS4XjxRYxN2GTDXG3D37soWiBbi7rqDj33fitUHXyJMLdPhtbGs85BStG9Op2aRXibtCH2Lo/EtY7PkWaxY8F5aXrKiufHPvkpow8S2XKD1VdWpHAV+5lO7ai9N8Z9zyogYLzIAfPqHDx6afQWUknRBn8Ot7k4Kt3cBGEhdvtAH8jhZGCmqDPsk1+qgx/OyWK9iiJsvsJWKmTf286AZl5vxO9NH1fZL0LpYQ5XvwrVi83eygLttEOU0I6ggngflJfs5KvfZXmvODdfK4oVzn3mJODbncLoYz1KxNZRPUFWycmkDaPmy2YyPjRnqE1S6SOP1zGVAEO2Leq/lGbB0J18b103oehyp6+t9KnpsoEhPDsr68xKCkKLl5QXVlfGikHJAMVI/CM0Hh8bva6bTNP5Ulsko6vYyvfGlbI0rEW3OJikvh0051M0lS175j3LMGj5Bs1iFZX43KoyebcfqYDtRQdrvigzsRAZoR9BdBAnVZtO5mfFMkrUtIX94Au8="
-#   distributions: sdist bdist_wheel
-#   upload_docs: no
-#   on:
-#     repo: sharppy/SHARPpy
-#     tags: false
-#     branch: andover
-#     condition: "$BUILD_CONDA = YES"
+ - provider: pypi
+   user: sharppy
+   password:
+     secure: "qgE7Hef6m9m6xf0CU976z/7KbpSaRIeucwVztsJQQCqP97FMnkb0bL0fhQMoxkVti1VCAuF9FXvWzWBKuKeu+sqP3pEE7GYlTVqq4kN3W55DleVFbyWy3Fyhu+6pRJL168kZg1rCNboX7Xw8RwI0l0r3DiSvjqWSYvOfdabgYlECImS4XjxRYxN2GTDXG3D37soWiBbi7rqDj33fitUHXyJMLdPhtbGs85BStG9Op2aRXibtCH2Lo/EtY7PkWaxY8F5aXrKiufHPvkpow8S2XKD1VdWpHAV+5lO7ai9N8Z9zyogYLzIAfPqHDx6afQWUknRBn8Ot7k4Kt3cBGEhdvtAH8jhZGCmqDPsk1+qgx/OyWK9iiJsvsJWKmTf286AZl5vxO9NH1fZL0LpYQ5XvwrVi83eygLttEOU0I6ggngflJfs5KvfZXmvODdfK4oVzn3mJODbncLoYz1KxNZRPUFWycmkDaPmy2YyPjRnqE1S6SOP1zGVAEO2Leq/lGbB0J18b103oehyp6+t9KnpsoEhPDsr68xKCkKLl5QXVlfGikHJAMVI/CM0Hh8bva6bTNP5Ulsko6vYyvfGlbI0rEW3OJikvh0051M0lS175j3LMGj5Bs1iFZX43KoyebcfqYDtRQdrvigzsRAZoR9BdBAnVZtO5mfFMkrUtIX94Au8="
+   distributions: sdist bdist_wheel
+   upload_docs: no
+   on:
+     repo: sharppy/SHARPpy
+     tags: true
+     branch: andover
+     condition: "$BUILD_CONDA = YES"
 # Deploy code to conda
  - provider: script
    script: bash ci/deploy_conda.sh
    on:
      repo: sharppy/SHARPpy
-     tags: false
+     tags: true
      branch: andover
      condition: "$BUILD_CONDA = YES"
 # Deploy docs to Github Pages
  - provider: script
    script: bash ci/build_docs.sh
    on:
      repo: sharppy/SHARPpy
-     tags: false
+     tags: true
      branch: andover
      condition: "$BUILD_DOCS = YES"
diff --git a/ci/deploy_conda.sh b/ci/deploy_conda.sh
@@ -30,6 +30,7 @@ conda convert -q -p win-32 -o $CONDA_BLD_PATH $CONDA_BLD_PATH/$OS/*.tar.bz2
 conda convert -q -p win-64 -o $CONDA_BLD_PATH $CONDA_BLD_PATH/$OS/*.tar.bz2
 conda convert -q -p linux-32 -o $CONDA_BLD_PATH $CONDA_BLD_PATH/$OS/*.tar.bz2
 conda convert -q -p linux-64 -o $CONDA_BLD_PATH $CONDA_BLD_PATH/$OS/*.tar.bz2
+conda convert -q -p osx-64 -o $CONDA_BLD_PATH $CONDA_BLD_PATH/$OS/*.tar.bz2
 ls $CONDA_BLD_PATH
 
 echo "Which anaconda"