Update workflow for release and conda (#41)

* Update workflow for release and conda * Update run_tests.yml
hdmf-dev · Aug 30, 2022 · e3ef56e · e3ef56e
1 parent a99f0a4
commit e3ef56e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml
@@ -43,12 +43,7 @@ jobs:
           twine upload -u ${{ secrets.BOT_PYPI_USER }} -p ${{ secrets.BOT_PYPI_PASSWORD }} --skip-existing dist/*
       - name: Publish wheel and source distributions as a GitHub release
         run: |
-          # use click<8 until https://github.com/j0057/github-release/issues/62 is resolved
-          python -m pip install "click<8" githubrelease
-          githubrelease --github-token ${{ secrets.BOT_GITHUB_TOKEN }} release hdmf-dev/hdmf-zarr \
+          python -m pip install "githubrelease>=1.5.9"
+          githubrelease --github-token ${{ secrets.BOT_GITHUB_TOKEN }} release hdmf-dev/hdmf \
             create ${{ github.ref_name }} --name ${{ github.ref_name }} \
-            --publish
-          sleep 5
-          # upload assets in a separate command until https://github.com/j0057/github-release/issues/67 is resolved
-          githubrelease --github-token ${{ secrets.BOT_GITHUB_TOKEN }} asset hdmf-dev/hdmf-zarr \
-            upload ${{ github.ref_name }} dist/*
+            --publish dist/*
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -114,8 +114,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: linux-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
-          - { name: linux-python3.10-upgraded  , test-tox-env: py310-upgraded  , build-tox-env: build-py310-upgraded  , python-ver: "3.10", os: ubuntu-latest }
+          - { name: conda-linux-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
+          - { name: conda-linux-python3.10-upgraded  , test-tox-env: py310-upgraded  , build-tox-env: build-py310-upgraded  , python-ver: "3.10", os: ubuntu-latest }
     steps:
       - name: Cancel any previous incomplete runs
         uses: styfle/[email protected]
@@ -132,15 +132,14 @@ jobs:
         with:
           auto-update-conda: true
           auto-activate-base: true
-          activate-environment: ""
+          activate-environment: true
+          python-version: ${{ matrix.python-ver }}
 
       - name: Install build dependencies
         run: |
-          conda update -n base -c defaults conda
           conda config --set always_yes yes --set changeps1 no
-          conda config --add channels conda-forge
-          conda install python=${{ matrix.python-ver }}
-          conda install tox
+          conda info
+          conda install -c conda-forge tox
           conda list
       - name: Run tox tests
         run: |