Skip to content

Commit

Permalink
add py312 to tox, setup.py, and github actions, plus refresh requirem…
Browse files Browse the repository at this point in the history
…ents
  • Loading branch information
mahmoud committed Nov 2, 2024
1 parent fcd6548 commit 3df8e6f
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 42 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: Tests
on:
push:
paths-ignore:
- 'docs/**'
- '*.md'
- '*.rst'
- "docs/**"
- "*.md"
- "*.rst"
pull_request:
paths-ignore:
- 'docs/**'
- '*.md'
- '*.rst'
- "docs/**"
- "*.md"
- "*.rst"
jobs:
tests:
name: ${{ matrix.name }}
Expand All @@ -18,14 +18,15 @@ jobs:
fail-fast: false
matrix:
include:
- {name: Linux, python: '3.11', os: ubuntu-latest, tox: py311}
- {name: Windows, python: '3.11', os: windows-latest, tox: py311}
- {name: Mac, python: '3.11', os: macos-latest, tox: py311}
- {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
- {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
- {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
- {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
- {name: 'PyPy3', python: 'pypy-3.9', os: ubuntu-latest, tox: pypy3}
- { name: Linux, python: "3.12", os: ubuntu-latest, tox: py312 }
- { name: Windows, python: "3.12", os: windows-latest, tox: py312 }
- { name: Mac, python: "3.12", os: macos-latest, tox: py312 }
- { name: "3.11", python: "3.11", os: ubuntu-latest, tox: py311 }
- { name: "3.10", python: "3.10", os: ubuntu-latest, tox: py310 }
- { name: "3.9", python: "3.9", os: ubuntu-latest, tox: py39 }
- { name: "3.8", python: "3.8", os: ubuntu-latest, tox: py38 }
- { name: "3.7", python: "3.7", os: ubuntu-latest, tox: py37 }
- { name: "PyPy3", python: "pypy-3.9", os: ubuntu-latest, tox: pypy3 }
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
Expand All @@ -52,4 +53,3 @@ jobs:
fail_ci_if_error: true
files: ./.tox/coverage.xml
token: ${{ secrets.CODECOV_TOKEN }}

2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# -- Project information -----------------------------------------------------

project = u'glom'
copyright = u'2023, Mahmoud Hashemi'
copyright = u'2024, Mahmoud Hashemi'
author = u'Mahmoud Hashemi'

# The short X.Y version
Expand Down
93 changes: 69 additions & 24 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,73 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --annotation-style=line --strip-extras requirements.in
# pip-compile requirements.in
#
attrs==23.1.0 # via -r requirements.in
boltons==23.1.1 # via -r requirements.in, face
cachetools==5.3.2 # via tox
chardet==5.2.0 # via tox
colorama==0.4.6 # via tox
coverage==7.2.7 # via -r requirements.in
distlib==0.3.8 # via virtualenv
exceptiongroup==1.2.0 # via pytest
face==22.0.0 # via -r requirements.in
filelock==3.12.2 # via tox, virtualenv
importlib-metadata==6.7.0 # via attrs, pluggy, pytest, tox, virtualenv
iniconfig==2.0.0 # via pytest
packaging==23.2 # via pyproject-api, pytest, tox
platformdirs==4.0.0 # via tox, virtualenv
pluggy==1.2.0 # via pytest, tox
pyproject-api==1.5.3 # via tox
pytest==7.4.3 # via -r requirements.in
pyyaml==6.0.1 # via -r requirements.in
tomli==2.0.1 # via pyproject-api, pytest, tox
tox==4.8.0 # via -r requirements.in
typing-extensions==4.7.1 # via importlib-metadata, platformdirs, tox
virtualenv==20.25.0 # via tox
zipp==3.15.0 # via importlib-metadata
attrs==24.2.0
# via -r requirements.in
boltons==24.1.0
# via
# -r requirements.in
# face
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.2.7
# via -r requirements.in
distlib==0.3.9
# via virtualenv
exceptiongroup==1.2.2
# via pytest
face==24.0.0
# via -r requirements.in
filelock==3.12.2
# via
# tox
# virtualenv
importlib-metadata==6.7.0
# via
# attrs
# pluggy
# pytest
# tox
# virtualenv
iniconfig==2.0.0
# via pytest
packaging==24.0
# via
# pyproject-api
# pytest
# tox
platformdirs==4.0.0
# via
# tox
# virtualenv
pluggy==1.2.0
# via
# pytest
# tox
pyproject-api==1.5.3
# via tox
pytest==7.4.4
# via -r requirements.in
pyyaml==6.0.1
# via -r requirements.in
tomli==2.0.1
# via
# pyproject-api
# pytest
# tox
tox==4.8.0
# via -r requirements.in
typing-extensions==4.7.1
# via
# importlib-metadata
# platformdirs
# tox
virtualenv==20.26.6
# via tox
zipp==3.15.0
# via importlib-metadata
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def import_path(module_name, path):
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'License :: OSI Approved :: BSD License',
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py37,py38,py39,py310,py311,pypy3,coverage-report,packaging
envlist = py37,py38,py39,py310,py311,py312,pypy3,coverage-report,packaging

[testenv]
changedir = .tox
Expand All @@ -18,6 +18,6 @@ commands = coverage combine --rcfile {toxinidir}/.tox-coveragerc
[testenv:packaging]
changedir = {toxinidir}
deps =
check-manifest==0.40
check-manifest==0.50
commands =
check-manifest

0 comments on commit 3df8e6f

Please sign in to comment.