ci: Automatically upload wheels to PyPi when publishing a tag

This commit also removes the use of $<RUN_ENV> command wrapper. Indeed,
scikit-build already takes care of setting up the expected environment
and installed requirements are either pure-python packages are already
distributed as wheels.

travis: Ensure system python uses latest version of pip. Create symlink
python2 -> python to have a consistent calling convention for invoking python.

appveyor: Ensure tags are built

Author: jcfr

.circleci/config.yml

@@ -1,96 +1,172 @@
-ci-steps: &ci-steps
-  working_directory: /work
-  steps:
-  - checkout
-  - run:
-      name:
-      command: |
-        export MANYLINUX_PYTHON=$(echo ${CIRCLE_JOB} | cut -d"_" -f2)
-        echo "MANYLINUX_PYTHON [${MANYLINUX_PYTHON}]"
-        /opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci
-        /opt/python/${MANYLINUX_PYTHON}/bin/ci
-
 version: 2
-jobs:
-  #
-  # x64
-  #
-  manylinux-x64_cp27-cp27m:
-    docker:
-      - image: dockcross/manylinux-x64
-    <<: *ci-steps
 
-  manylinux-x64_cp27-cp27mu:
-    docker:
-      - image: dockcross/manylinux-x64
-    <<: *ci-steps
+references:
 
-  manylinux-x64_cp34-cp34m:
+  ci_steps: &ci_steps
+    working_directory: /work
+    steps:
+      - checkout
+      - run:
+          name: Run CI
+          command: |
+            #
+            # Set UPLOAD_SDIST environment variable
+            #
+            export UPLOAD_SDIST=$(echo ${CIRCLE_JOB} | cut -d"_" -f3)
+            echo "UPLOAD_SDIST [${UPLOAD_SDIST}]"
+            #
+            # Run CI
+            #
+            export MANYLINUX_PYTHON=$(echo ${CIRCLE_JOB} | cut -d"_" -f2)
+            echo "MANYLINUX_PYTHON [${MANYLINUX_PYTHON}]"
+            /opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci
+            /opt/python/${MANYLINUX_PYTHON}/bin/ci
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - dist
+
+  x64_build_job: &x64_build_job
     docker:
       - image: dockcross/manylinux-x64
-    <<: *ci-steps
+    <<: *ci_steps
 
-  manylinux-x64_cp35-cp35m:
+  x86_build_job: &x86_build_job
     docker:
-      - image: dockcross/manylinux-x64
-    <<: *ci-steps
+      - image: dockcross/manylinux-x86
+    <<: *ci_steps
+
+  no_filters: &no_filters
+    filters:
+      tags:
+        only: /.*/
+
+jobs:
 
+  # x64
+  manylinux-x64_cp27-cp27m:
+    <<: *x64_build_job
+  manylinux-x64_cp27-cp27mu:
+    <<: *x64_build_job
+  manylinux-x64_cp34-cp34m:
+    <<: *x64_build_job
+  manylinux-x64_cp35-cp35m:
+    <<: *x64_build_job
   manylinux-x64_cp36-cp36m:
-    docker:
-      - image: dockcross/manylinux-x64
-    <<: *ci-steps
+    <<: *x64_build_job
+  manylinux-x64_cp37-cp37m_upload-sdist:
+    <<: *x64_build_job
 
-  manylinux-x64_cp37-cp37m:
-    docker:
-      - image: dockcross/manylinux-x64
-    <<: *ci-steps
-  #
   # x86
-  #
   manylinux-x86_cp27-cp27m:
-    docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
-
+    <<: *x86_build_job
   manylinux-x86_cp27-cp27mu:
-    docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
-
+    <<: *x86_build_job
   manylinux-x86_cp34-cp34m:
-    docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
-
+    <<: *x86_build_job
   manylinux-x86_cp35-cp35m:
-    docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
-
+    <<: *x86_build_job
   manylinux-x86_cp36-cp36m:
+    <<: *x86_build_job
+  manylinux-x86_cp37-cp37m:
+    <<: *x86_build_job
+
+  deploy-master:
     docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
+      - image: circleci/python:3.7.0-stretch
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Deploy master
+          command: |
+            echo "Deploy master (not implemented)"
 
-  manylinux-x86_cp37-cp37m:
+  deploy-release:
     docker:
-      - image: dockcross/manylinux-x86
-    <<: *ci-steps
+      - image: circleci/python:3.7.0-stretch
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Deploy release
+          command: |
+            echo "Deploy release"
+            python -m venv ../venv
+            . ../venv/bin/activate
+            pip install twine
+            ls dist
+            twine upload -u $PYPI_USER -p $PYPI_PASSWORD --skip-existing dist/*
 
 workflows:
   version: 2
   build-test-deploy:
     jobs:
-      - manylinux-x64_cp27-cp27m
-      - manylinux-x64_cp27-cp27mu
-      - manylinux-x64_cp34-cp34m
-      - manylinux-x64_cp35-cp35m
-      - manylinux-x64_cp36-cp36m
-      - manylinux-x64_cp37-cp37m
+      # x64
+      - manylinux-x64_cp27-cp27m:
+          <<: *no_filters
+      - manylinux-x64_cp27-cp27mu:
+          <<: *no_filters
+      - manylinux-x64_cp34-cp34m:
+          <<: *no_filters
+      - manylinux-x64_cp35-cp35m:
+          <<: *no_filters
+      - manylinux-x64_cp36-cp36m:
+          <<: *no_filters
+      - manylinux-x64_cp37-cp37m_upload-sdist:
+          <<: *no_filters
+      # x86
+      - manylinux-x86_cp27-cp27m:
+          <<: *no_filters
+      - manylinux-x86_cp27-cp27mu:
+          <<: *no_filters
+      - manylinux-x86_cp34-cp34m:
+          <<: *no_filters
+      - manylinux-x86_cp35-cp35m:
+          <<: *no_filters
+      - manylinux-x86_cp36-cp36m:
+          <<: *no_filters
+      - manylinux-x86_cp37-cp37m:
+          <<: *no_filters
+
+      - deploy-master:
+          requires:
+            # x64
+            - manylinux-x64_cp27-cp27m
+            - manylinux-x64_cp27-cp27mu
+            - manylinux-x64_cp34-cp34m
+            - manylinux-x64_cp35-cp35m
+            - manylinux-x64_cp36-cp36m
+            - manylinux-x64_cp37-cp37m_upload-sdist
+            # x86
+            - manylinux-x86_cp27-cp27m
+            - manylinux-x86_cp27-cp27mu
+            - manylinux-x86_cp34-cp34m
+            - manylinux-x86_cp35-cp35m
+            - manylinux-x86_cp36-cp36m
+            - manylinux-x86_cp37-cp37m
+          filters:
+            branches:
+              only: master
+      - deploy-release:
+          requires:
+            # x64
+            - manylinux-x64_cp27-cp27m
+            - manylinux-x64_cp27-cp27mu
+            - manylinux-x64_cp34-cp34m
+            - manylinux-x64_cp35-cp35m
+            - manylinux-x64_cp36-cp36m
+            - manylinux-x64_cp37-cp37m_upload-sdist
+            # x86
+            - manylinux-x86_cp27-cp27m
+            - manylinux-x86_cp27-cp27mu
+            - manylinux-x86_cp34-cp34m
+            - manylinux-x86_cp35-cp35m
+            - manylinux-x86_cp36-cp36m
+            - manylinux-x86_cp37-cp37m
+          filters:
+            tags:
+              only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
+            branches:
+              ignore: /.*/
 
-      - manylinux-x86_cp27-cp27m
-      - manylinux-x86_cp27-cp27mu
-      - manylinux-x86_cp34-cp34m
-      - manylinux-x86_cp35-cp35m
-      - manylinux-x86_cp36-cp36m
-      - manylinux-x86_cp37-cp37m

.travis.yml

@@ -1,7 +1,7 @@
-
 branches:
  only:
   - master
+  - /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
 
 language: python
 
@@ -43,8 +43,9 @@ cache:
     - $HOME/downloads
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir $HOME/bin; ln -s $(which pip2) $HOME/bin/pip; fi
-  - pip install scikit-ci==0.13.0 scikit-ci-addons==0.11.0
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir $HOME/bin; ln -s $(which pip2) $HOME/bin/pip; ln -s $(which python2) $HOME/bin/python; fi
+  - python -m pip install --disable-pip-version-check --upgrade pip
+  - pip install -U scikit-ci scikit-ci-addons
   - ci_addons --install ../addons
 
 install:
@@ -55,6 +56,26 @@ script:
 
 after_success:
   - ci after_test
+
+deploy:
+  # deploy-release
+  - provider: script
+    script: pwd && ls dist;echo "deploy-release" && ~/.pyenv/versions/${PYTHON_VERSION}/bin/twine -u $PYPI_USER -p $PYPI_PASSWORD --skip-existing dist/*
+    skip_cleanup: true
+    on:
+      repo: ${TRAVIS_REPO_SLUG}
+      tags: true
+  # deploy-master
+  - provider: script
+    script: pwd && ls dist;echo "deploy-master" && echo "not implemented"
+    skip_cleanup: true
+    on:
+      repo: ${TRAVIS_REPO_SLUG}
+      branch: master
+
 env:
   global:
-    secure: sgcVf6bqGdG6xg0wNKzYPbFekcW5O5y0TBGki+NPh3OtdFiQGkTEVaY/hAhjxsl5UEVIuOItj0RHz99CcKUzdGjQkC7AielE7/6yNrXJDXjXhpXqJhnrDmkLS4VZUdLu+h3uzum5mU+jrGn8yvpuFctTvHI7r2GYGyreBtX6iwNXPP+MgVpb5OX6TH70knu2hSfnG7464tAKk77zFZc13hARWma4cO1Ax6iuKetEOL39raVqskGvMnzMzh98DmWYqkMwCzPNpV30C16j8yXNjQ9JKExvHv90lrZCC/ZI5xJkjO9VLR5onYVz/lYwMWB2lO6zBh66I4r9K39hCk15BPalINah3oryONCAEmjNpU5mOZfRlqqXMl/1vVlJf/wHwdqN851JpTgdyQ+iTiPvC1Je16SbK74dSm9T7nlMQkCIZJmIDiSpljDlBzpGZtiXBKEXYcCJSn5hEAeW34SP4h5kgFeFF4W0hLgZWjBOj+0WEwrIy0hobJ/UxhXkZkDcB7Q26QeCFz52K+la9qjh1zyUV5iHpIDlUhOEJ8pMGSmVmOw6k5h0+V4hNei3Hbi4KQu+GfYpmNNVfx1Dxx+/In1F02nT5s662CsrdgBPwzqsFtJBGylcEkiDUuKZ6Q7l5AjMK6bhbLh6dg5ejWaw2d+pCT/5orZk0HP006jwdF0=
+    # PYPI_USER
+    - secure: "Xejg5qGnAyo3G+/TaaAr1uHzDv9GLo3mxi6Aw/hZc9gF9lYix1TvkfE6GEBKdPgSLJSqF9NJrwKTt37XH1DjSRLG+qw6Bt1goi5Bkugdk+SC5qmMkvAoG0EKyD119WS4ObrpzqAFcOQqG+4F6iDkSuJLA+dzA3yAzTME4pkhr/2dn0krOSqIcTlgifPwhEaMgo//WRT2dEBM5dWoehXsEMD7VMOUyC0DlV15lKTPKSzTrDEUPU7UFnXgIqZM/brEPbWPQr5Jzgu7BeBk6bmPiiYeh28Cq2juzOzA+JWcGgJmXOfsImYwYuAWZrf0pkE0uQjLySvIBKT7phJv05eNqIxmv/wHK1BPcyMV+2IgFR4+f5ty6C4VUV0hT0HvHr3pMa/8A/5wSNCShEAMTHrwPM5VPWFJtUKTtS5+wwNQDI39MLk/vr9ZTo+y3WJHPaRR0nRpbA3nXFHSqoJJunoMyeI8x9cXZvJ9IENMxGuo3CfBT5RGZamfqSTgn6NjL51ArIMKpvUfm3tXTtlvCHenED1ZQeJI1nWZEalxl8pTyAZoA8S1+h8wraZrUPzhM0QuVpw7vZQeOYu2VSdHO46yxUWoQyb+JWrDTN7EC8vOl7QQzIQlqOWJB5uDJD7UlKKtneTHJrdfXvGxS/hf+Y+hFZK7r+/PDPS6aQjSNDyy+js="
+    # PYPI_PASSWORD
+    - secure: "iEHYaOC/yivDupsbRzohWYCwFMZbCfT2hYOM96akQtOfd1d37rqFCFjDKr3BNyvHyHzj+uNQ7IblynWAqu3cax2Z8b9YuIFXFAslD76IIgeIhxmi8jPtamMK0NBXam/LEL49EIVXUnwVZrWjnLcJxVaBHGS/9Ft3zWP5Gspa4G1yAJDhNfs+jrFipxO4DOBie9mGI2jFdbFRgcCYoY6Jo4y95zxUG1YF5e+8sUobLoBgVqyaJP4SP/Zu/4CEWMfJev8EjLBzzkoPwOU+hC09qwf2FQCvBXFrudpjPpY23WDFeKf+LcMoW9tIoUmP6UJcQibqHeidimrbo9jST0+wTo1NYjrvriKrlMho/QS4iYkd5N6DGUrhSXEMSiqfdMjVGDZ00wvCsT3DwqE9eG7K+Kw09enchjcZcggZIt9crqZPJg3GMdSwPYTlRpf2OQmE4OHL3pN5dSH5Es/sb0X1G6JQgB/2Ia9Aks2ywYEdzUZhbMqfLVx75bVS4bLfYMAMhE/j7NxpYaUlVkFhz3srLhnrYyAcvCQ6XF4cSeFfxD1ie62/qFIF/QH5u76t91uURHygvNdyJCNHhVJnnWgN9kPsJxfyfdOC2Dnrz/jJcw5irsgQVO2/K4iyGyBVoOqwwpymjoCkxB8capEoLRNLcwyQqCTBnMtGykyRYF2I7FA="

appveyor.yml

@@ -1,14 +1,13 @@
-
 branches:
- only:
-  - master
+  only:
+    - master
+    - /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
 
 version: "0.0.1.{build}"
 
 environment:
   matrix:
 
-    # Visual Studio (Python 2 & 3, 32 & 64 bit)
     - PYTHON_DIR: "C:\\Python27"
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "32"
@@ -49,21 +48,26 @@ environment:
       PYTHON_ARCH: "64"
       BLOCK: "0"
 
-#    - PYTHON_DIR: "C:\\Python37"
-#      PYTHON_VERSION: "3.7.x"
-#      PYTHON_ARCH: "64"
-#      BLOCK: "0"
-#
-#    - PYTHON_DIR: "C:\\Python37-x64"
-#      PYTHON_VERSION: "3.7.x"
-#      PYTHON_ARCH: "64"
-#      BLOCK: "0"
+    - PYTHON_DIR: "C:\\Python37"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "64"
+      BLOCK: "0"
+
+    - PYTHON_DIR: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "64"
+      BLOCK: "0"
 
-  GIRDER_TOKEN:
-    secure: BJR/8+Z51IgDgkwnKVkmzxxP315kpgy6r952X3P03bIe0YTNo1ZeOSeqqEvJwFQF
+  PYPI_USER:
+    secure: j/nubIi1eucjCtYuwpykWg==
+  PYPI_PASSWORD:
+    secure: qDoPKmtLMdcKUKRHuTlfaajjzO4Q4yu25FM5JuB7z84=
+
+cache:
+  - C:\\cmake-3.6.2
 
 init:
-  - python -m pip install scikit-ci==0.13.0 scikit-ci-addons==0.11.0
+  - python -m pip install -U scikit-ci scikit-ci-addons
   - python -m ci_addons --install ../addons
 
   - ps: ../addons/appveyor/rolling-build.ps1
@@ -83,5 +87,17 @@ after_test:
 on_finish:
   - ps: ../addons/appveyor/enable-worker-remote-access.ps1 -check_for_block
 
+deploy_script:
+  - ps: |
+      if ($env:appveyor_repo_tag -eq $true -and $env:appveyor_repo_tag_name –match "^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$") {
+        Write-Host "deploy release"
+        $env:PATH="$env:PYTHON_DIR/Scripts/;$env:PATH"
+        twine upload -u $env:PYPI_USER -p $env:PYPI_PASSWORD --skip-existing dist/*
+      } elseif ($env:appveyor_repo_branch -eq "master") {
+         Write-Host "deploy master (not implemented)"
+      } else {
+        Write-Host "nothing to deploy"
+      }
+
 matrix:
   fast_finish: false