From c6b41de6b76f56c9d358b870b957ba3a6ab1f919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= Date: Sat, 18 Feb 2023 10:36:54 +0100 Subject: [PATCH] chore(stack): upgrade stack --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/mkdocs.yml | 4 ++-- pylintrc | 4 ++-- setup.py | 2 +- tox.ini | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1202da..12b0586 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,11 +11,13 @@ jobs: strategy: matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] # pypy-3.7 is supported but a bit slow. + python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8", "pypy-3.9" ] regex: [ "0", "1" ] exclude: # regex module doesn't play well with pypy and unicode. - - python-version: "pypy-3.7" + - python-version: "pypy-3.8" + regex: "1" + - python-version: "pypy-3.9" regex: "1" # test regex module only with Python 3.9. - python-version: "3.7" @@ -55,7 +57,7 @@ jobs: REBULK_REGEX_ENABLED: ${{ matrix.regex }} - name: Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 commitlint: if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository @@ -271,11 +273,11 @@ jobs: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - name: Merge master to develop - uses: robotology/gh-action-nightly-merge@v1.3.3 + uses: robotology/gh-action-nightly-merge@v1.4.0 with: stable_branch: 'master' development_branch: 'develop' allow_ff: true user_name: github-actions env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index 7bf0113..95f6161 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -7,8 +7,8 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: 3.x diff --git a/pylintrc b/pylintrc index d17a2b2..3bf03c8 100644 --- a/pylintrc +++ b/pylintrc @@ -307,8 +307,8 @@ min-public-methods=1 [EXCEPTIONS] # Exceptions that will emit a warning when caught. -overgeneral-exceptions=BaseException, - Exception +overgeneral-exceptions=builtins.BaseException, + builtins.Exception [FORMAT] diff --git a/setup.py b/setup.py index 422c28c..53a9e6d 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f: with io.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf-8') as f: changelog = f.read() -install_requires = ['rebulk>=3.1.0', 'babelfish>=0.6.0', 'python-dateutil', 'importlib-resources;python_version<"3.9"'] +install_requires = ['rebulk>=3.2.0', 'babelfish>=0.6.0', 'python-dateutil', 'importlib-resources;python_version<"3.9"'] dev_require = ['tox', 'mkdocs', 'mkdocs-material', 'pyinstaller', 'python-semantic-release'] diff --git a/tox.ini b/tox.ini index 0d2fce4..85a0575 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py38,py39,py310,py311,pypy3 +envlist = py37,py38,py39,py310,py311,pypy3.8,pypy3.9 [testenv] commands =