Skip to content

Commit bfe013a

Browse files
committed
build(setup): remove end-of-life python versions
1 parent 5c749e5 commit bfe013a

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.github/workflows/ci.yaml

+13-12
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
pull_request:
88
branches: [main]
99

10-
env:
11-
REGISTRY: "registry.digitalocean.com/solidsystems"
12-
1310
jobs:
1411
lint:
1512
name: Lint
@@ -21,54 +18,58 @@ jobs:
2118
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
2219
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4
2320
with:
24-
cache: pip
2521
python-version: ${{ matrix.python-version }}
22+
# cache: pip
2623
- run: |
2724
pip install .
28-
pip install .[test]
25+
pip install ".[test]"
2926
# TODO: Setup pre-commit, use it
3027
3128
test:
3229
name: Test
3330
runs-on: ubuntu-latest
31+
needs: lint
3432
strategy:
3533
matrix:
3634
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
3735
steps:
3836
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3937
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4
4038
with:
41-
cache: pip
42-
- run: |
39+
python-version: ${{ matrix.python-version }}
40+
# cache: pip
41+
- env:
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
run: |
4344
pip install .
44-
pip install .[test]
45+
pip install ".[test]"
4546
coverage run --source=pytool -m pytest -vv
4647
coveralls
4748
# - uses: MishaKav/pytest-coverage-comment@main
4849

4950
autoapprove:
50-
name: Renovate
51+
name: Renovate / Approve
5152
needs: [lint, test]
5253
runs-on: ubuntu-latest
5354
permissions:
5455
issues: write
5556
pull-requests: write
5657
steps:
57-
- name: Approve
58+
- name: Auto-approve
5859
uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
5960
if: github.actor == 'renovatebot' || github.actor == 'renovate[bot]'
6061
with:
6162
github-token: ${{ secrets.GITHUB_TOKEN }}
6263

6364
automerge:
64-
name: Renovate
65+
name: Renovate / Merge
6566
needs: autoapprove
6667
runs-on: ubuntu-latest
6768
permissions:
6869
issues: write
6970
pull-requests: write
7071
steps:
71-
- name: Merge
72+
- name: Auto-merge
7273
uses: pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584 # v0.15.6
7374
if: github.actor == 'renovatebot' || github.actor == 'renovate[bot]'
7475
env:

setup.py

+13-14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ def version():
1717
except Exception as err:
1818
raise RuntimeError("Could not get version:\n" + str(err))
1919

20+
TESTS_REQUIRE = [
21+
'bson',
22+
'configargparse',
23+
'coverage',
24+
'coveralls',
25+
'mock',
26+
'pytest',
27+
]
2028

2129
setup(
2230
name='pytool',
@@ -29,27 +37,18 @@ def version():
2937
license='ALv2',
3038
packages=find_packages(exclude=['test']),
3139
install_requires=['simplejson >= 3.2.0', 'six'],
32-
tests_require=[
33-
'bson',
34-
'configargparse',
35-
'coverage',
36-
'coveralls',
37-
'mock',
38-
'pytest',
39-
],
40+
tests_require=TESTS_REQUIRE,
41+
extras_require={ "test": TESTS_REQUIRE},
4042
classifiers=[
4143
'Development Status :: 5 - Production/Stable',
4244
'Intended Audience :: Developers',
4345
'License :: OSI Approved :: Apache Software License',
4446
'Operating System :: OS Independent',
45-
'Programming Language :: Python :: 2.7',
46-
'Programming Language :: Python :: 3.3',
47-
'Programming Language :: Python :: 3.4',
48-
'Programming Language :: Python :: 3.5',
49-
'Programming Language :: Python :: 3.6',
50-
'Programming Language :: Python :: 3.7',
5147
'Programming Language :: Python :: 3.8',
5248
'Programming Language :: Python :: 3.9',
49+
'Programming Language :: Python :: 3.10',
50+
'Programming Language :: Python :: 3.11',
51+
'Programming Language :: Python :: 3.12',
5352
'Programming Language :: Python :: Implementation :: PyPy',
5453
'Topic :: Software Development :: Libraries',
5554
'Topic :: Utilities',

0 commit comments

Comments
 (0)