Skip to content

Commit d08026b

Browse files
Update to use uv for environment management, setuptools-scm for version
1 parent 21ed0e8 commit d08026b

File tree

7 files changed

+12
-809
lines changed

7 files changed

+12
-809
lines changed

.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
pyrolite/_version.py export-subst
2-
31
*.ipynb diff=jupyternotebook
42

53
*.svg binary

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include versioneer.py
2-
include pyrolite/_version.py
31
include LICENSE
42
recursive-include pyrolite/data/Aitchison *
53
recursive-include pyrolite/data/geochem *

environment.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

pyproject.toml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=61.0", "versioneer[toml]"]
2+
requires = ["setuptools>=80", "setuptools-scm[simple]>=8"]
33
build-backend = "setuptools.build_meta"
44

55

@@ -8,14 +8,13 @@ name = "pyrolite"
88
authors = [{ name = "Morgan Williams", email = "morgan.williams@csiro.au" }]
99
description = "Tools for geochemical data analysis."
1010
license = { file = "LICENSE" }
11-
requires-python = ">=3.8"
11+
requires-python = ">=3.9"
1212
classifiers = [
1313
"Development Status :: 4 - Beta",
1414
"Intended Audience :: Science/Research",
1515
"Intended Audience :: Education",
1616
"Natural Language :: English",
1717
"Programming Language :: Python :: 3 :: Only",
18-
"Programming Language :: Python :: 3.8",
1918
"Programming Language :: Python :: 3.9",
2019
"Programming Language :: Python :: 3.10",
2120
"Programming Language :: Python :: 3.11",
@@ -31,7 +30,7 @@ dependencies = [
3130
"numpydoc",
3231
"tinydb>4.1", # >4.1 required for read-only access mode for JSON storage
3332
"periodictable",
34-
"matplotlib<3.9",
33+
"matplotlib!=3.8.4",
3534
"mpltern>=0.4.0",
3635
"scipy>=1.2", # uses scipy.optimize.Bounds, added around 1.2
3736
"sympy>=1.7",
@@ -48,13 +47,11 @@ Changelog = "https://github.com/me/spam/blob/master/CHANGELOG.md"
4847
[project.optional-dependencies]
4948
docs = [
5049
"sphinx_rtd_theme",
51-
"docutils<0.17",
50+
# "docutils<0.17",
5251
"sphinx>=4",
5352
"sphinx-autodoc-annotation",
5453
"sphinx_gallery>=0.6.0",
5554
"recommonmark",
56-
# "jupyterlite-sphinx",
57-
# "jupyterlite-pyodide-kernel",
5855
]
5956
db = ["pyodbc", "psycopg2"]
6057
test = ["pytest", "pytest-runner", "pytest-cov", "coverage", "coveralls"]
@@ -64,17 +61,14 @@ stats = ["statsmodels", "scikit-learn"] # statsmodels for conditional ke
6461
excel = ["xlrd", "openpyxl"]
6562
dev = [
6663
"pytest",
67-
"versioneer",
6864
"ruff",
69-
"isort",
7065
"twine",
7166
"pyrolite[test,docs,skl]",
7267
"build",
7368
]
7469

7570
[tool.setuptools.packages]
76-
find = { exclude = ['test*', "docs*"] } # "**/__pycache__/*"
77-
# include = ["Aitchison/*.py"],
71+
find = { exclude = ['test*', "docs*"] }
7872

7973
[tool.setuptools.dynamic]
8074
readme = { file = "README.md", content-type = "text/markdown" }
@@ -91,14 +85,6 @@ omit = [
9185
"*/_version.py", # Ignore _version.py
9286
]
9387

94-
[tool.versioneer]
95-
VCS = "git"
96-
style = "pep440"
97-
versionfile_source = "pyrolite/_version.py"
98-
versionfile_build = "pyrolite/_version.py"
99-
tag_prefix = ""
100-
parentdir_prefix = "pyrolite-"
101-
10288
[tool.pytest.ini_options]
10389
python_files = "*.py"
10490
addopts = "--assert=plain --cov=pyrolite --cov-report html --cov-report xml --cov-report term-missing"

pyrolite/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
pyrolite: A set of tools for getting the most from your geochemical data.
33
"""
44

5-
from ._version import get_versions
5+
from ._version import __version__
66

7-
__version__ = get_versions()["version"]
8-
del get_versions
97

108
import importlib
119
import pkgutil

0 commit comments

Comments
 (0)