Actions - PR just for testing (#163)

* Fixed CIbuild
opencadc · Nov 9, 2020 · 0e4bb89 · 0e4bb89
1 parent 0a982ed
commit 0e4bb89
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 deletions.
diff --git a/workflows/python-package.yml → .github/workflows/build.yml b/workflows/python-package.yml → .github/workflows/build.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: CIbuild
 
 on:
   push:
@@ -77,36 +77,36 @@ jobs:
             cd ..
           done
           coverage combine $(ls -d */.coverage) || exit 1;
-#       - name: Consolidate coverage
-#         env: 
-#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-#           CI_BRANCH: ${GITHUB_REF#"ref/heads"}
-#         run: |
-#            coveralls
-#   publish:
-#     needs: coverage
-#     runs-on: ubuntu-latest
-#     if: startsWith(github.ref, 'refs/tags/')
-#     steps:
-#     - name: Checkout
-#       uses: actions/checkout@v2
-#     - name: Prepare
-#       run: |
-#         # set the TRAVIS_TAG env variable for next steps
-#         echo "TRAVIS_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-#     - name: Publish
-#       env: 
-#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#           TWINE_USERNAME: ${{ secrets.PYPI_PUBLISH_USER }}
-#           TWINE_PASSWORD: ${{ secrets.PYPI_PUBLISH_PWORD }}
-#       run: |
-#         python -m pip install --upgrade pip
-#         # need sudo to have the command in the PATH
-#         sudo pip install twine
-#         for i in $(ls -d */); do
-#           cd $i
-#           pip install -r dev_requirements.txt;
-#           cd ..
-#         done
-#         ./.publish.sh || exit 1
+      - name: Consolidate coverage
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          CI_BRANCH: ${GITHUB_REF#"ref/heads"}
+        run: |
+           coveralls
+  publish:
+    needs: coverage
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Prepare
+      run: |
+        # set the TRAVIS_TAG env variable for next steps
+        echo "TRAVIS_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+    - name: Publish
+      env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TWINE_USERNAME: ${{ secrets.PYPI_PUBLISH_USER }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PUBLISH_PWORD }}
+      run: |
+        python -m pip install --upgrade pip
+        # need sudo to have the command in the PATH
+        sudo pip install twine
+        for i in $(ls -d */); do
+          cd $i
+          pip install -r dev_requirements.txt;
+          cd ..
+        done
+        ./.publish.sh || exit 1
diff --git a/.publish.sh b/.publish.sh
@@ -26,6 +26,7 @@ python setup.py clean sdist || { echo "Errors building $product"; exit -1; }
 echo "Publish on pypi"
 twine upload dist/* || { echo "Errors publishing $TRAVIS_TAG"; exit -1; }
 
+
 # check version available
 pip uninstall -y $product
 pip install --upgrade --pre $product==$version || { echo "$TRAVIS_TAG not installed on pypi" ; exit -1; } 
diff --git a/README.rst b/README.rst
@@ -4,8 +4,9 @@ VOS - VOSpace tools
 .. image:: https://img.shields.io/pypi/pyversions/vos.svg
     :target: https://pypi.python.org/pypi/vos
 
-.. image:: https://img.shields.io/travis/opencadc/vostools/master.svg   
-    :target: https://travis-ci.org/opencadc/vostools?branch=master 
+
+.. image:: https://github.com/opencadc/vostools/workflows/CIbuild/badge.svg
+    :target: https://github.com/opencadc/vostools/actions 
 
 .. image:: https://img.shields.io/coveralls/opencadc/vostools/master.svg   
     :target: https://coveralls.io/github/opencadc/vostools?branch=master 

diff --git a/vos/setup.cfg b/vos/setup.cfg
@@ -50,7 +50,7 @@ edit_on_github = False
 github_project = opencadc/vostools
 install_requires = html2text>=2016.5.29 cadcutils>=1.1.26 future aenum
 # version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
-version = 3.2c
+version = 0.0.1a
 
 
 [entry_points]