Skip to content

Commit fe1e0bb

Browse files
authored
Merge pull request #75 from acsone/drop-py36
Drop python 3.6 support, test python 3.11
2 parents 0491848 + e9112b2 commit fe1e0bb

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

.github/workflows/ci.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,16 @@ on:
88
pull_request:
99

1010
jobs:
11-
pre-commit:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
16-
- uses: pre-commit/[email protected]
1711
tests:
1812
name: "Python ${{ matrix.python-version }}"
1913
runs-on: "ubuntu-latest"
2014
strategy:
2115
fail-fast: false
2216
matrix:
23-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
17+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
2418
steps:
25-
- uses: "actions/checkout@v2"
26-
- uses: "actions/setup-python@v2"
19+
- uses: "actions/checkout@v3"
20+
- uses: "actions/setup-python@v4"
2721
with:
2822
python-version: "${{ matrix.python-version }}"
2923
- name: "Install dependencies"
@@ -40,4 +34,4 @@ jobs:
4034
- name: "Run tox targets for ${{ matrix.python-version }}"
4135
run: |
4236
python -m tox
43-
- uses: codecov/codecov-action@v1
37+
- uses: codecov/codecov-action@v3

README.rst

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
:alt: License: AGPL-3
44
.. image:: https://github.com/acsone/git-aggregator/actions/workflows/ci.yml/badge.svg
55
:target: https://github.com/acsone/git-aggregator/actions/workflows/ci.yml
6+
.. image:: https://results.pre-commit.ci/badge/github/acsone/git-aggregator/master.svg
7+
:target: https://results.pre-commit.ci/latest/github/acsone/git-aggregator/master
8+
:alt: pre-commit.ci status
69
.. image:: https://img.shields.io/pypi/pyversions/git-aggregator
710

811
==============
@@ -226,6 +229,7 @@ Changes
226229

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

230234
3.0.1 (2022-09-21)
231235
------------------

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
'GNU Affero General Public License v3 or later (AGPLv3+)',
1818
'Operating System :: POSIX',
1919
'Programming Language :: Python :: 3',
20-
'Programming Language :: Python :: 3.6',
2120
'Programming Language :: Python :: 3.7',
2221
'Programming Language :: Python :: 3.8',
2322
'Programming Language :: Python :: 3.9',
2423
'Programming Language :: Python :: 3.10',
24+
'Programming Language :: Python :: 3.11',
2525
"Topic :: Utilities",
2626
"Topic :: System :: Shells",
2727
],
@@ -41,7 +41,7 @@
4141
'colorama',
4242
'requests',
4343
],
44-
python_requires=">=3.6",
44+
python_requires=">=3.7",
4545
entry_points=dict(
4646
console_scripts=['gitaggregate=git_aggregator.main:main']),
4747
test_suite='tests',

tox.ini

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
[gh-actions]
22
python =
3-
3.6: py36
43
3.7: py37
54
3.8: py38
65
3.9: py39
76
3.10: py310
8-
pypy3: pypy3
7+
3.11: py311
98

109
[tox]
11-
envlist = py36, py37, py38, py39, py310, pypy3
10+
envlist = py37, py38, py39, py310, py311
1211

1312
[testenv]
1413
passenv =

0 commit comments

Comments
 (0)