From 47f57184a9d0a25c1b415638d0b003dad88ce607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= Date: Tue, 1 Nov 2022 12:18:52 +0100 Subject: [PATCH] feat(dependencies): drop Python 3.6 support --- .github/workflows/ci.yml | 93 ++++++++++++++++++------------------ .github/workflows/mkdocs.yml | 2 +- setup.py | 2 +- tox.ini | 2 +- 4 files changed, 49 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bf0b979..e1202da2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,33 +11,31 @@ jobs: strategy: matrix: - python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ] # pypy-3.6, pypy-3.7 are supported but a bit slow. + python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] # pypy-3.7 is supported but a bit slow. regex: [ "0", "1" ] exclude: # regex module doesn't play well with pypy and unicode. - - python-version: "pypy-3.6" - regex: "1" - python-version: "pypy-3.7" regex: "1" # test regex module only with Python 3.9. - - python-version: "3.6" - regex: "1" - python-version: "3.7" regex: "1" - python-version: "3.8" regex: "1" - python-version: "3.10" regex: "1" + - python-version: "3.11" + regex: "1" steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Checkout - uses: actions/checkout@v2 - - name: Install Dependencies run: | pip install -e .[dev,test] @@ -65,10 +63,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: wagoid/commitlint-github-action@v2 + + - uses: wagoid/commitlint-github-action@v5 build-setuptools: if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository @@ -77,16 +76,16 @@ jobs: runs-on: ubuntu-latest steps: - - name: Setup python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Setup python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Install Dependencies run: | pip install -e .[dev] @@ -102,7 +101,7 @@ jobs: - name: Build run: python setup.py sdist bdist_wheel - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: guessit-python path: ./dist @@ -114,16 +113,16 @@ jobs: runs-on: ubuntu-latest steps: - - name: Setup python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Setup python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Install Dependencies run: | pip install -e .[dev] @@ -142,7 +141,7 @@ jobs: - name: Check binary run: ./dist/guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: matrix.regex == '0' with: name: guessit-bin-linux @@ -155,16 +154,16 @@ jobs: runs-on: windows-latest steps: - - name: Setup python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Setup python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Install Dependencies run: | pip install -e .[dev] @@ -183,7 +182,7 @@ jobs: - name: Check binary run: ./dist/guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: guessit-bin-windows path: ./dist @@ -195,16 +194,16 @@ jobs: runs-on: macos-latest steps: - - name: Setup python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Setup python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Install Dependencies run: | pip install -e .[dev] @@ -223,7 +222,7 @@ jobs: - name: Check binary run: ./dist/guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: guessit-bin-macos path: ./dist @@ -235,17 +234,17 @@ jobs: runs-on: ubuntu-latest steps: - - name: Setup python 3.9 - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: actions/download-artifact@v2 + - name: Setup python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + + - uses: actions/download-artifact@v3 with: path: artifacts @@ -272,7 +271,7 @@ jobs: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - name: Merge master to develop - uses: robotology/gh-action-nightly-merge@v1.3.2 + uses: robotology/gh-action-nightly-merge@v1.3.3 with: stable_branch: 'master' development_branch: 'develop' diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index d4cdcec0..7bf0113d 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -16,7 +16,7 @@ jobs: - run: mkdocs build - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@4.1.5 + uses: JamesIves/github-pages-deploy-action@v4 with: token: ${{ secrets.GITHUB_TOKEN }} branch: gh-pages diff --git a/setup.py b/setup.py index 222d738d..69732d9d 100644 --- a/setup.py +++ b/setup.py @@ -43,11 +43,11 @@ 'Operating System :: OS Independent', 'Intended Audience :: Developers', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Multimedia', 'Topic :: Software Development :: Libraries :: Python Modules' ], diff --git a/tox.ini b/tox.ini index 99982926..0d2fce42 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,py37,py38,py39,py310,pypy3 +envlist = py37,py38,py39,py310,py311,pypy3 [testenv] commands =