Merge d3c203b into 38d3aec

.circleci/config.yml

@@ -109,13 +109,19 @@ jobs:
       - image: python
     steps:
       - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            set -ex
+            python -m pip install "setuptools>=20.2.0" "wheel"
       - run:
           name: Build tarball
-          command: python setup.py --quiet sdist --dist-dir .
+          command: python setup.py --quiet sdist --dist-dir . bdist_wheel --universal --dist-dir .
       - persist_to_workspace:
           root: .
           paths:
             - gwpy-*.tar.*
+            - gwpy-*-none-any.whl
 
   flake8:
     docker:
@@ -265,6 +271,19 @@ jobs:
     environment:
       PYTHON_VERSION: "2.7"
 
+  # -- deploy ---------------
+
+  deploy:
+    docker:
+      - image: python
+    steps:
+      - run:
+          name: Twine upload
+          command: |
+            # TWINE_USERNAME and TWINE_PASSWORD are set in repo settings
+            python -m pip install twine
+            python -m twine upload gwpy-*.tar.* gwpy-*-none-any.whl
+
 # -- workflow ---------------
 
 workflows:
@@ -332,3 +351,18 @@ workflows:
       - el7:2.7:
           requires:
             - sdist
+
+      # deploy
+      - deploy:
+          requires:
+            - conda:2.7
+            - conda:3.6
+            - conda:3.7
+            - debian:stretch:2.7
+            - debian:stretch:3.5
+            - el7:2.7
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              ignore: /.*/

.travis.yml

@@ -60,19 +60,6 @@ after_success:  # submit coverage results
 before_deploy:
   - git clean -dfX
 
-deploy:
-  - provider: pypi
-    user: duncanmmacleod
-    password: ${PYPI_PASSWD}
-    distributions: sdist bdist_wheel
-    on:
-      condition: -z "${DOCKER_IMAGE}"
-      branch: master
-      tags: true
-      python: '3.6'
-      repo: gwpy/gwpy
-      skip_existing: true
-
 notifications:
   slack:
     secure: jQdoSpwNbUnq0Eo7o6Ko7vuhu58LQdfy8jFKxLUnUjv/GLezK/PPAQCU9SgmyDPh1yD8sb5Xa8UtbNfGtpYdwBAGwZxPHz3oQQAflivFwcF6UP7/NlAB9muSOOnL0QfQyX1I4sIKOkX+gkl+TBciX4v58B8NUU02dDkwDqTLUqQ=