Skip to content

Commit

Permalink
Merge pull request #75 from acsone/drop-py36
Browse files Browse the repository at this point in the history
Drop python 3.6 support, test python 3.11
  • Loading branch information
sbidoul committed Jul 22, 2023
2 parents 0491848 + e9112b2 commit fe1e0bb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,16 @@ on:
pull_request:

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.2
tests:
name: "Python ${{ matrix.python-version }}"
runs-on: "ubuntu-latest"
strategy:
fail-fast: false
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: "actions/checkout@v2"
- uses: "actions/setup-python@v2"
- uses: "actions/checkout@v3"
- uses: "actions/setup-python@v4"
with:
python-version: "${{ matrix.python-version }}"
- name: "Install dependencies"
Expand All @@ -40,4 +34,4 @@ jobs:
- name: "Run tox targets for ${{ matrix.python-version }}"
run: |
python -m tox
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
:alt: License: AGPL-3
.. image:: https://github.com/acsone/git-aggregator/actions/workflows/ci.yml/badge.svg
:target: https://github.com/acsone/git-aggregator/actions/workflows/ci.yml
.. image:: https://results.pre-commit.ci/badge/github/acsone/git-aggregator/master.svg
:target: https://results.pre-commit.ci/latest/github/acsone/git-aggregator/master
:alt: pre-commit.ci status
.. image:: https://img.shields.io/pypi/pyversions/git-aggregator

==============
Expand Down Expand Up @@ -226,6 +229,7 @@ Changes

* [BREAKING] drop support for other configuration file formats than yaml
* Ensure git pull is always done in fast-forward mode
* Drop support for python 3.6, test with python 3.11, stop testing with pypy

3.0.1 (2022-09-21)
------------------
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
'GNU Affero General Public License v3 or later (AGPLv3+)',
'Operating System :: POSIX',
'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 :: Utilities",
"Topic :: System :: Shells",
],
Expand All @@ -41,7 +41,7 @@
'colorama',
'requests',
],
python_requires=">=3.6",
python_requires=">=3.7",
entry_points=dict(
console_scripts=['gitaggregate=git_aggregator.main:main']),
test_suite='tests',
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310
pypy3: pypy3
3.11: py311

[tox]
envlist = py36, py37, py38, py39, py310, pypy3
envlist = py37, py38, py39, py310, py311

[testenv]
passenv =
Expand Down

0 comments on commit fe1e0bb

Please sign in to comment.