Skip to content

Commit

Permalink
feat(dependencies): drop Python 3.6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Toilal committed Nov 1, 2022
1 parent 9f60c9c commit 47f5718
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 50 deletions.
93 changes: 46 additions & 47 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310,pypy3
envlist = py37,py38,py39,py310,py311,pypy3

[testenv]
commands =
Expand Down

0 comments on commit 47f5718

Please sign in to comment.