From cd89fe0100254d07dc33145b18ee63678447ca59 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 11 Sep 2024 09:22:27 +0200 Subject: [PATCH 1/5] MAINT: move generic project settings to pyproject.toml --- pyproject.toml | 29 +++++++++++++++++++++++++++++ setup.py | 16 ---------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 53084902..ec9747c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,35 @@ requires = [ "tomli; python_version < '3.11'", ] +[project] +name = "pyogrio" +dynamic = ["version"] +authors = [{ name = "Brendan C. Ward", email = "bcward@astutespruce.com" }] +maintainers = [{ name = "pyogrio contributors" }] +license = { text = "MIT License" } +description = "Vectorized spatial vector file format I/O using GDAL/OGR" +readme = "README.md" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "Topic :: Scientific/Engineering :: GIS", +] +requires-python = ">=3.8" +dependencies = ["certifi", "numpy", "packaging"] + +[project.optional-dependencies] +dev = ["cython"] +test = ["pytest", "pytest-cov"] +benchmark = ["pytest-benchmark"] +geopandas = ["geopandas"] + +[project.urls] +Home = "https://pyogrio.readthedocs.io/" +Repository = "https://github.com/geopandas/pyogrio" + [tool.cibuildwheel] skip = ["cp36-*", "cp37-*", "pp*", "*musllinux*"] archs = ["auto64"] diff --git a/setup.py b/setup.py index 99833162..25699c09 100644 --- a/setup.py +++ b/setup.py @@ -202,24 +202,8 @@ def get_gdal_config(): cmdclass["build_ext"] = build_ext setup( - name="pyogrio", version=version, packages=find_packages(), - url="https://github.com/geopandas/pyogrio", - license="MIT", - author="Brendan C. Ward", - author_email="bcward@astutespruce.com", - description="Vectorized spatial vector file format I/O using GDAL/OGR", - long_description_content_type="text/markdown", - long_description=open("README.md").read(), - python_requires=">=3.8", - install_requires=["certifi", "numpy", "packaging"], - extras_require={ - "dev": ["Cython"], - "test": ["pytest", "pytest-cov"], - "benchmark": ["pytest-benchmark"], - "geopandas": ["geopandas"], - }, include_package_data=True, exclude_package_data={'': ['*.h', '_*.pxd', '_*.pyx']}, cmdclass=cmdclass, From ccf21f1158415e1f7623e63e4506046fa08d46bc Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 13 Sep 2024 15:33:28 +0200 Subject: [PATCH 2/5] drop python version indication in ruff and cibuildwheel sections --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ec9747c5..f7282508 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,7 @@ requires = [ # tomli is used by versioneer "tomli; python_version < '3.11'", ] +build-backend = "setuptools.build_meta" [project] name = "pyogrio" @@ -37,7 +38,7 @@ Home = "https://pyogrio.readthedocs.io/" Repository = "https://github.com/geopandas/pyogrio" [tool.cibuildwheel] -skip = ["cp36-*", "cp37-*", "pp*", "*musllinux*"] +skip = ["pp*", "*musllinux*"] archs = ["auto64"] manylinux-x86_64-image = "manylinux-vcpkg-gdal:latest" manylinux-aarch64-image = "manylinux-aarch64-vcpkg-gdal:latest" @@ -92,7 +93,6 @@ tag_prefix = "v" [tool.ruff] line-length = 88 extend-exclude = ["doc/*", "benchmarks/*", "pyogrio/_version.py"] -target-version = "py38" [tool.ruff.lint] select = [ From 1e543545ed2e6c3672c1cc5cf0cf2b86424c73a9 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Fri, 13 Sep 2024 15:34:18 +0200 Subject: [PATCH 3/5] Update pyproject.toml Co-authored-by: Brendan Ward --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f7282508..0be96c8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ name = "pyogrio" dynamic = ["version"] authors = [{ name = "Brendan C. Ward", email = "bcward@astutespruce.com" }] maintainers = [{ name = "pyogrio contributors" }] -license = { text = "MIT License" } +license = { file = "LICENSE" } description = "Vectorized spatial vector file format I/O using GDAL/OGR" readme = "README.md" classifiers = [ From b06cd985d021b1190f03f4088cf7c7180b9a7f03 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 16 Sep 2024 09:56:43 +0200 Subject: [PATCH 4/5] Update pyproject.toml Co-authored-by: Brendan Ward --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0be96c8e..e3717ceb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta" [project] name = "pyogrio" dynamic = ["version"] -authors = [{ name = "Brendan C. Ward", email = "bcward@astutespruce.com" }] +authors = [{ name = "Brendan C. Ward", email = "bcward@astutespruce.com" }, { name = "pyogrio contributors" }] maintainers = [{ name = "pyogrio contributors" }] license = { file = "LICENSE" } description = "Vectorized spatial vector file format I/O using GDAL/OGR" From 079980754f6216c05756b98056787933b7d45738 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 16 Sep 2024 10:00:02 +0200 Subject: [PATCH 5/5] reflow --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e3717ceb..fb09a0f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,10 @@ build-backend = "setuptools.build_meta" [project] name = "pyogrio" dynamic = ["version"] -authors = [{ name = "Brendan C. Ward", email = "bcward@astutespruce.com" }, { name = "pyogrio contributors" }] +authors = [ + { name = "Brendan C. Ward", email = "bcward@astutespruce.com" }, + { name = "pyogrio contributors" } +] maintainers = [{ name = "pyogrio contributors" }] license = { file = "LICENSE" } description = "Vectorized spatial vector file format I/O using GDAL/OGR"