CI workflow update (#2)

* CI workflow update * Update setup.py/README.rst to match pyproject.toml/README.md
qctrl · Nov 27, 2019 · 539c1fb · 539c1fb
1 parent 5313832
commit 539c1fb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
@@ -5,11 +5,7 @@ on:
     branches:
       - '**'
     tags-ignore:
-      - '**'
-    paths-ignore:         # Don't trigger on files that are updated by the CI
-      - 'pyproject.toml'  # Note changes to poetry.lock will still build
-      - 'setup.py'
-      - 'README.rst'
+      - '*.*'
 
 jobs:
 
@@ -19,61 +15,55 @@ jobs:
     - uses: actions/checkout@v1
     - name: Perform housekeeping checks
       env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}        
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/housekeeping.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/housekeeping.sh
 
   linting:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Install Python dependencies
-      env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/install-python-dependencies.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/install-python-dependencies.sh
     - name: Run Pylint
       run: |
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 poetry run pylint_runner || true
+        ./ci docker run qctrl/python-build:3.7 poetry run pylint_runner || true
     - name: Run Pylama
       run: |
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 poetry run pylama || true
+        ./ci docker run qctrl/python-build:3.7 poetry run pylama || true
     - name: Run Markdownlint
       run: |
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 mdl -- -ig . || true
+        ./ci docker run qctrl/python-build:3.7 mdl -- -ig . || true
 
   pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [36, 37]
+        python: [3.6, 3.7]
     steps:
     - uses: actions/checkout@v1
     - name: Install Python dependencies
-      env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-${{ matrix.python }} /scripts/install-python-dependencies.sh
+        ./ci docker run qctrl/python-build:${{ matrix.python }} /scripts/install-python-dependencies.sh
     - name: Run Pytest
       run: |
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-${{ matrix.python }} /scripts/pytest.sh
+        ./ci docker run qctrl/python-build:${{ matrix.python }} /scripts/pytest.sh
 
   publish_internally:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Publish development version
       env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-dev-version.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/publish-dev-version.sh
diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml
@@ -12,21 +12,17 @@ jobs:
     - uses: actions/checkout@v1
     - name: Update version in code
       env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/housekeeping.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/housekeeping.sh
     - name: Publish publicly
       env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-release-publicly.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/publish-release-publicly.sh
     - name: Publish internally
-      env:
-        GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
       run: |
-        ./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-release-internally.sh
+        ./ci docker run qctrl/python-build:3.7 /scripts/publish-release-internally.sh
diff --git a/setup.py b/setup.py
@@ -27,14 +27,15 @@
     version='0.0.2',
     description='Q-CTRL Cirq Adapter',
     python_requires='<3.8,>=3.6.4',
-    project_urls={'repository': 'https://github.com/qctrl/python-cirq'},
+    project_urls={"repository": "https://github.com/qctrl/python-cirq"},
     author='Q-CTRL',
     author_email='[email protected]',
     license='Apache-2.0',
     keywords='quantum computing open source engineering cirq',
     classifiers=['Development Status :: 5 - Production/Stable', 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Education', 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3.6', 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Visualization', 'Topic :: Software Development :: Embedded Systems', 'Topic :: System :: Distributed Computing'],
     packages=['qctrlcirq'],
+    package_dir={"": "."},
     package_data={},
     install_requires=['cirq==0.*,>=0.6.0', 'numpy==1.*,>=1.16.0', 'qctrl-open-controls==3.*,>=3.0.0', 'scipy==1.*,>=1.3.0', 'toml==0.*,>=0.10.0'],
-    extras_require={'dev': ['pylama', 'pylint', 'pylint-runner', 'pytest', 'sphinx==2.*,>=2.2.0']},
+    extras_require={"dev": ["pylama", "pylint", "pylint-runner", "pytest", "sphinx==2.*,>=2.2.0"]},
 )