Skip to content

Commit

Permalink
Merge pull request #23 from astrofrog/update-infrastructure
Browse files Browse the repository at this point in the history
Update infrastructure to use pyproject.toml, and add testing for Python 3.12
  • Loading branch information
astrofrog authored Aug 30, 2024
2 parents 97d0837 + 064da40 commit 952dafb
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 62 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,21 @@ jobs:
envs: |
- linux: py38-test
- linux: py39-test
- linux: py310-test-dev
- linux: py311-test-dev
- linux: py310-test
- linux: py311-test
- linux: py312-test-dev
- macos: py38-test
- macos: py39-test
- macos: py310-test-dev
- macos: py311-test-dev
- macos: py310-test
- macos: py311-test
- macos: py312-test-dev
- windows: py38-test
- windows: py39-test
- windows: py310-test-dev
- windows: py311-test-dev
- windows: py310-test
- windows: py311-test
- windows: py312-test-dev
publish:
needs: tests
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ glue/qt/glue_qt_resources.py
.pytest_cache

.tox

glue_geospatial/_version.py
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Installing
If you are using conda, you can easily install the
plugin and all the required dependencies with::

conda install -c glueviz glue-geospatial
conda install -c conda-forge glue-geospatial

Alternatively, if you don't use conda, you can use:

Expand Down
7 changes: 1 addition & 6 deletions glue_geospatial/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
from pkg_resources import get_distribution, DistributionNotFound

try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
__version__ = 'undefined'
from ._version import __version__

__all__ = ['__version__', 'setup']

Expand Down
37 changes: 37 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[build-system]
requires = [ "setuptools>=61.2", "setuptools_scm",]
build-backend = "setuptools.build_meta"

[project]
name = "glue-geospatial"
description = "Experimental glue plugin for geospatial imagery"
readme = "README.rst"
requires-python = ">=3.8"
dependencies = [ "glue-core>=1.0", "rasterio>=1.0", "pyproj>=2.3", "affine",]
dynamic = [ "version",]

[tool.setuptools_scm]
version_file = "glue_geospatial/_version.py"

[[project.authors]]
name = "Thomas Robitaille"
email = "[email protected]"

[project.urls]
Homepage = "https://github.com/glue-viz/glue-geospatial"

[project.optional-dependencies]
test = [ "pytest", "pytest-cov", "pytest-faulthandler", "mock",]

[tool.setuptools]
zip-safe = true
include-package-data = false

[project.entry-points."glue.plugins"]
glue_geospatial = "glue_geospatial:setup"

[tool.setuptools.package-data]
"glue_geospatial.tests" = [ "data/*",]

[tool.setuptools.packages.find]
namespaces = false
32 changes: 0 additions & 32 deletions setup.cfg

This file was deleted.

16 changes: 0 additions & 16 deletions setup.py

This file was deleted.

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,37,38,39}-test{-devdeps}
envlist = py{38,39,310,311,312}-test{-devdeps}
requires = pip >= 18.0
setuptools >= 30.3.0

Expand Down

0 comments on commit 952dafb

Please sign in to comment.