Skip to content

Commit

Permalink
Merge pull request #272 from GeoStat-Framework/add_py311
Browse files Browse the repository at this point in the history
Add Python 3.11 and git-archive support
  • Loading branch information
MuellerSeb authored Nov 3, 2022
2 parents 7938ba6 + 8b8973b commit 267efa6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true)$
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
with:
fetch-depth: '0'

- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9

- name: Install dependencies
run: |
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
fetch-depth: '0'

- name: Build wheels
uses: pypa/cibuildwheel@v2.8.1
uses: pypa/cibuildwheel@v2.11.2
env:
CIBW_ARCHS: ${{ matrix.cfg.arch }}
with:
Expand All @@ -85,7 +85,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sphinx:
formats: all

python:
version: 3.7
version: 3.8
install:
- method: pip
path: .
Expand Down
21 changes: 10 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[build-system]
requires = [
"setuptools>=62",
"wheel",
"setuptools_scm[toml]>=6.4",
"setuptools>=64",
"setuptools_scm>=7",
"oldest-supported-numpy",
"Cython>=0.28.3,<3.0",
"extension-helpers",
"Cython>=0.29.32,<3.0",
"extension-helpers>=1",
]
build-backend = "setuptools.build_meta"

Expand All @@ -16,9 +15,6 @@ description = "GSTools: A geostatistical toolbox."
authors = [
{name = "Sebastian Müller, Lennart Schüler", email = "[email protected]"},
]
maintainers = [
{name = "Sebastian Müller, Lennart Schüler", email = "[email protected]"},
]
readme = "README.md"
license = {text = "LGPL-3.0"}
dynamic = ["version"]
Expand All @@ -40,6 +36,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: GIS",
"Topic :: Scientific/Engineering :: Hydrology",
Expand Down Expand Up @@ -101,9 +98,11 @@ line_length = 79
[tool.black]
line-length = 79
target-version = [
"py36",
"py37",
"py38",
"py39",
"py310",
"py311",
]

[tool.coverage]
Expand Down Expand Up @@ -155,8 +154,8 @@ target-version = [
[tool.cibuildwheel]
# Switch to using build
build-frontend = "build"
# Disable building PyPy wheels on all platforms, 32bit for py3.10 and musllinux builds, py3.6
skip = ["cp36-*", "pp*", "cp310-win32", "cp310-manylinux_i686", "*-musllinux_*"]
# Disable building PyPy wheels on all platforms, 32bit for py3.10/11 and musllinux builds, py3.6
skip = ["cp36-*", "pp*", "cp31*-win32", "cp31*-manylinux_i686", "*-musllinux_*"]
# Run the package tests using `pytest`
test-extras = "test"
test-command = "pytest -v {package}/tests"
Expand Down

0 comments on commit 267efa6

Please sign in to comment.