From e792ef52021ef4eb7e71f3681fcb4b5bb1cee66c Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Mon, 28 Jul 2025 16:57:35 -0600 Subject: [PATCH 1/7] replace pkg_resources --- pythia_datasets/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythia_datasets/__init__.py b/pythia_datasets/__init__.py index 2332e4a..0e02a2f 100644 --- a/pythia_datasets/__init__.py +++ b/pythia_datasets/__init__.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 # flake8: noqa """Top-level module for pythia-datasets .""" -from pkg_resources import DistributionNotFound, get_distribution +from importlib.metadata import version as _version from .datasets import DATASETS, locate try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: # pragma: no cover + __version__ = _version(__name__) +except Exception: # pragma: no cover # package is not installed __version__ = 'unknown' # pragma: no cover From d3be4a4ece67893113ae7350e413656599834573 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Mon, 28 Jul 2025 17:17:10 -0600 Subject: [PATCH 2/7] replace pkg_resources use in datasets.py --- pythia_datasets/datasets.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythia_datasets/datasets.py b/pythia_datasets/datasets.py index fa41fe3..7dd3279 100644 --- a/pythia_datasets/datasets.py +++ b/pythia_datasets/datasets.py @@ -1,4 +1,4 @@ -import pkg_resources +from importlib.resources import files import pooch DATASETS = pooch.create( @@ -7,10 +7,10 @@ env='PYTHIA_DATASETS_DIR', ) -with pkg_resources.resource_stream('pythia_datasets', 'registry.txt') as registry_file: +ref = files('pythia_datasets'.joinpath('registry.txt') +with ref.open('rb') as registry_file: DATASETS.load_registry(registry_file) - def locate(): """The absolute path to the sample data storage location on disk. From aae184154a0d6bacd0e1ea18d62d013cec8affea Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Mon, 28 Jul 2025 17:17:41 -0600 Subject: [PATCH 3/7] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5a4785b..95de00d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ extend-ignore = E203,E501,E402,W605 [isort] known_first_party=pythia_datasets -known_third_party=pkg_resources,pooch,setuptools +known_third_party=pooch,setuptools multi_line_output=3 include_trailing_comma=True force_grid_wrap=0 From 025bfd11984f7d52f0c8e2706f5e842d712ce255 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Mon, 28 Jul 2025 17:21:00 -0600 Subject: [PATCH 4/7] fix typo --- pythia_datasets/datasets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythia_datasets/datasets.py b/pythia_datasets/datasets.py index 7dd3279..3c4f9ce 100644 --- a/pythia_datasets/datasets.py +++ b/pythia_datasets/datasets.py @@ -7,7 +7,7 @@ env='PYTHIA_DATASETS_DIR', ) -ref = files('pythia_datasets'.joinpath('registry.txt') +ref = files('pythia_datasets').joinpath('registry.txt') with ref.open('rb') as registry_file: DATASETS.load_registry(registry_file) From 58612db32be2f0a89e3260eede2bcf5b75e4d2ec Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 23:25:30 +0000 Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pythia_datasets/datasets.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pythia_datasets/datasets.py b/pythia_datasets/datasets.py index 3c4f9ce..7615483 100644 --- a/pythia_datasets/datasets.py +++ b/pythia_datasets/datasets.py @@ -1,4 +1,5 @@ from importlib.resources import files + import pooch DATASETS = pooch.create( @@ -11,6 +12,7 @@ with ref.open('rb') as registry_file: DATASETS.load_registry(registry_file) + def locate(): """The absolute path to the sample data storage location on disk. From 3bcdb8431ed38bcaca2cad987813aa7da0730cc8 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Tue, 11 Nov 2025 18:40:53 -0700 Subject: [PATCH 6/7] update Python versions --- .github/workflows/ci.yaml | 2 +- pyproject.toml | 2 +- setup.py | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65d6976..82c89ff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v5 - uses: conda-incubator/setup-miniconda@v3 diff --git a/pyproject.toml b/pyproject.toml index 3d0427a..029d703 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 100 -target-version = ['py38'] +target-version = ['py39'] skip-string-normalization = true [tool.check-manifest] diff --git a/setup.py b/setup.py index 0e6c048..55199e0 100644 --- a/setup.py +++ b/setup.py @@ -12,15 +12,17 @@ setup( maintainer='Project Pythia Team', maintainer_email='', - python_requires='>=3.7', + python_requires='>=3.9', classifiers=[ 'Development Status :: 2 - Pre-Alpha', 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Topic :: Scientific/Engineering', 'Operating System :: OS Independent', 'Intended Audience :: Science/Research', From 5a4448981679055b566deaa80cc0c4f4d58e52d1 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Tue, 11 Nov 2025 18:42:50 -0700 Subject: [PATCH 7/7] group Dependabot updates --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bad6ba3..bd72c5b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,3 +5,7 @@ updates: schedule: # Check for updates once a week interval: 'weekly' + groups: + actions: + patterns: + - "*"