Skip to content

Commit 3df8e6f

Browse files
committed
add py312 to tox, setup.py, and github actions, plus refresh requirements
1 parent fcd6548 commit 3df8e6f

File tree

5 files changed

+88
-42
lines changed

5 files changed

+88
-42
lines changed

.github/workflows/tests.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: Tests
22
on:
33
push:
44
paths-ignore:
5-
- 'docs/**'
6-
- '*.md'
7-
- '*.rst'
5+
- "docs/**"
6+
- "*.md"
7+
- "*.rst"
88
pull_request:
99
paths-ignore:
10-
- 'docs/**'
11-
- '*.md'
12-
- '*.rst'
10+
- "docs/**"
11+
- "*.md"
12+
- "*.rst"
1313
jobs:
1414
tests:
1515
name: ${{ matrix.name }}
@@ -18,14 +18,15 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
include:
21-
- {name: Linux, python: '3.11', os: ubuntu-latest, tox: py311}
22-
- {name: Windows, python: '3.11', os: windows-latest, tox: py311}
23-
- {name: Mac, python: '3.11', os: macos-latest, tox: py311}
24-
- {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
25-
- {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
26-
- {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
27-
- {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
28-
- {name: 'PyPy3', python: 'pypy-3.9', os: ubuntu-latest, tox: pypy3}
21+
- { name: Linux, python: "3.12", os: ubuntu-latest, tox: py312 }
22+
- { name: Windows, python: "3.12", os: windows-latest, tox: py312 }
23+
- { name: Mac, python: "3.12", os: macos-latest, tox: py312 }
24+
- { name: "3.11", python: "3.11", os: ubuntu-latest, tox: py311 }
25+
- { name: "3.10", python: "3.10", os: ubuntu-latest, tox: py310 }
26+
- { name: "3.9", python: "3.9", os: ubuntu-latest, tox: py39 }
27+
- { name: "3.8", python: "3.8", os: ubuntu-latest, tox: py38 }
28+
- { name: "3.7", python: "3.7", os: ubuntu-latest, tox: py37 }
29+
- { name: "PyPy3", python: "pypy-3.9", os: ubuntu-latest, tox: pypy3 }
2930
steps:
3031
- uses: actions/checkout@v4
3132
- uses: actions/setup-python@v4
@@ -52,4 +53,3 @@ jobs:
5253
fail_ci_if_error: true
5354
files: ./.tox/coverage.xml
5455
token: ${{ secrets.CODECOV_TOKEN }}
55-

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# -- Project information -----------------------------------------------------
3333

3434
project = u'glom'
35-
copyright = u'2023, Mahmoud Hashemi'
35+
copyright = u'2024, Mahmoud Hashemi'
3636
author = u'Mahmoud Hashemi'
3737

3838
# The short X.Y version

requirements.txt

+69-24
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,73 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --annotation-style=line --strip-extras requirements.in
5+
# pip-compile requirements.in
66
#
7-
attrs==23.1.0 # via -r requirements.in
8-
boltons==23.1.1 # via -r requirements.in, face
9-
cachetools==5.3.2 # via tox
10-
chardet==5.2.0 # via tox
11-
colorama==0.4.6 # via tox
12-
coverage==7.2.7 # via -r requirements.in
13-
distlib==0.3.8 # via virtualenv
14-
exceptiongroup==1.2.0 # via pytest
15-
face==22.0.0 # via -r requirements.in
16-
filelock==3.12.2 # via tox, virtualenv
17-
importlib-metadata==6.7.0 # via attrs, pluggy, pytest, tox, virtualenv
18-
iniconfig==2.0.0 # via pytest
19-
packaging==23.2 # via pyproject-api, pytest, tox
20-
platformdirs==4.0.0 # via tox, virtualenv
21-
pluggy==1.2.0 # via pytest, tox
22-
pyproject-api==1.5.3 # via tox
23-
pytest==7.4.3 # via -r requirements.in
24-
pyyaml==6.0.1 # via -r requirements.in
25-
tomli==2.0.1 # via pyproject-api, pytest, tox
26-
tox==4.8.0 # via -r requirements.in
27-
typing-extensions==4.7.1 # via importlib-metadata, platformdirs, tox
28-
virtualenv==20.25.0 # via tox
29-
zipp==3.15.0 # via importlib-metadata
7+
attrs==24.2.0
8+
# via -r requirements.in
9+
boltons==24.1.0
10+
# via
11+
# -r requirements.in
12+
# face
13+
cachetools==5.5.0
14+
# via tox
15+
chardet==5.2.0
16+
# via tox
17+
colorama==0.4.6
18+
# via tox
19+
coverage==7.2.7
20+
# via -r requirements.in
21+
distlib==0.3.9
22+
# via virtualenv
23+
exceptiongroup==1.2.2
24+
# via pytest
25+
face==24.0.0
26+
# via -r requirements.in
27+
filelock==3.12.2
28+
# via
29+
# tox
30+
# virtualenv
31+
importlib-metadata==6.7.0
32+
# via
33+
# attrs
34+
# pluggy
35+
# pytest
36+
# tox
37+
# virtualenv
38+
iniconfig==2.0.0
39+
# via pytest
40+
packaging==24.0
41+
# via
42+
# pyproject-api
43+
# pytest
44+
# tox
45+
platformdirs==4.0.0
46+
# via
47+
# tox
48+
# virtualenv
49+
pluggy==1.2.0
50+
# via
51+
# pytest
52+
# tox
53+
pyproject-api==1.5.3
54+
# via tox
55+
pytest==7.4.4
56+
# via -r requirements.in
57+
pyyaml==6.0.1
58+
# via -r requirements.in
59+
tomli==2.0.1
60+
# via
61+
# pyproject-api
62+
# pytest
63+
# tox
64+
tox==4.8.0
65+
# via -r requirements.in
66+
typing-extensions==4.7.1
67+
# via
68+
# importlib-metadata
69+
# platformdirs
70+
# tox
71+
virtualenv==20.26.6
72+
# via tox
73+
zipp==3.15.0
74+
# via importlib-metadata

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def import_path(module_name, path):
5858
'Programming Language :: Python :: 3.9',
5959
'Programming Language :: Python :: 3.10',
6060
'Programming Language :: Python :: 3.11',
61+
'Programming Language :: Python :: 3.12',
6162
'Programming Language :: Python :: Implementation :: CPython',
6263
'Programming Language :: Python :: Implementation :: PyPy',
6364
'License :: OSI Approved :: BSD License',

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py37,py38,py39,py310,py311,pypy3,coverage-report,packaging
2+
envlist = py37,py38,py39,py310,py311,py312,pypy3,coverage-report,packaging
33

44
[testenv]
55
changedir = .tox
@@ -18,6 +18,6 @@ commands = coverage combine --rcfile {toxinidir}/.tox-coveragerc
1818
[testenv:packaging]
1919
changedir = {toxinidir}
2020
deps =
21-
check-manifest==0.40
21+
check-manifest==0.50
2222
commands =
2323
check-manifest

0 commit comments

Comments
 (0)