bump version, merge pull request #1091 from tqdm/devel

tqdm · Dec 5, 2020 · 6cb32c2 · 6cb32c2
2 parents 668fa0e + dce4d61
commit 6cb32c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 31 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.head_ref != 'devel'
     strategy:
       matrix:
-        python: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
+        python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
     name: py${{ matrix.python }}
     runs-on: ubuntu-latest
     steps:
@@ -71,8 +71,7 @@ jobs:
       run: |
         if [[ "$PYVER" == py* ]]; then
           tox -e $PYVER                                             # basic:pypy
-        elif [[ "$PYVER" == *3.4 || "$PYVER" == *3.9 ]]; then
-          [[ "$PYVER" == *3.4 ]] && sed -i '/relative_files/d' .coveragerc
+        elif [[ "$PYVER" == *3.9 ]]; then
           tox -e py${PYVER/./}                                      # basic
         elif [[ "$PYVER" == "3.7" ]]; then
           tox -e py${PYVER/./}-tf,py${PYVER/./}-tf-keras            # full
@@ -83,8 +82,7 @@ jobs:
         PYVER: ${{ matrix.python }}
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
-    - if: ${{ matrix.python != 3.4 }}
-      name: Coveralls Parallel
+    - name: Coveralls Parallel
       uses: AndreMiras/coveralls-python-action@develop
       with:
         parallel: true
@@ -143,7 +141,7 @@ jobs:
       id: create_release
       uses: actions/create-release@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
         release_name: tqdm ${{ github.ref }} stable
@@ -152,7 +150,7 @@ jobs:
     - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
       uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ${{ steps.collect_assets.outputs.asset_path }}
@@ -161,36 +159,20 @@ jobs:
     - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
       uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ${{ steps.collect_assets.outputs.asset_path_sig }}
         asset_name: ${{ steps.collect_assets.outputs.asset_name_sig }}
         asset_content_type: text/plain
-    - name: Snap install
-      uses: samuelmeuli/action-snapcraft@v1
-      with:
-        use_lxd: true
-    - name: Snap build
-      run: |
-        export SNAPCRAFT_IMAGE_INFO='{"build_url": "https://github.com/tqdm/tqdm/actions/runs/'$GITHUB_RUN_ID'"}'
-        sg lxd -c 'snapcraft --use-lxd'
-      env:
-        SNAPCRAFT_BUILD_INFO: 1  # https://snapcraft.io/blog/introducing-developer-notifications-for-snap-security-updates
+    - uses: snapcore/action-build@v1
+      id: snap_build
     - if: github.event_name == 'push' && steps.collect_assets.outputs.snap_channel
-      name: Snap login
-      uses: samuelmeuli/action-snapcraft@v1
+      uses: snapcore/action-publish@v1
       with:
-        skip_install: true
-        snapcraft_token: ${{ secrets.SNAP_TOKEN }}
-    - if: github.event_name == 'push' && steps.collect_assets.outputs.snap_channel
-      name: Snap deploy
-      run: |
-        if [ -n "$(ls tqdm*.snap 2>/dev/null)" ]; then
-          sudo snapcraft upload tqdm*.snap --release $CHANNEL
-        fi
-      env:
-        CHANNEL: ${{ steps.collect_assets.outputs.snap_channel }}
+        store_login: ${{ secrets.SNAP_TOKEN }}
+        snap: ${{ steps.snap_build.outputs.snap }}
+        release: ${{ steps.collect_assets.outputs.snap_channel }}
     - name: Docker build push
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

diff --git a/setup.cfg b/setup.cfg
@@ -62,7 +62,6 @@ classifiers =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7