Skip to content

Commit 52fe1bd

Browse files
stefmolinstefmolin
authored
Merge branch 'main' into dependabot/pip/setuptools-78.1.1
2 parents c69cb80 + 3a87ca7 commit 52fe1bd

9 files changed

Lines changed: 48 additions & 59 deletions

File tree

‎.github/workflows/check-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
name: Build docs
2020

2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2323
with:
2424
fetch-depth: 0
2525

26-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
26+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2727
with:
2828
python-version: "3.x"
2929

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
MPLBACKEND: Agg # non-interactive backend for matplotlib
5151

5252
steps:
53-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
53+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5454

5555
- name: Set up Python ${{ matrix.python-version }}
56-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
56+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
5757
with:
5858
python-version: ${{ matrix.python-version }}
5959

‎.github/workflows/citation-validate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
name: Validate CITATION.cff
2121
steps:
2222
- name: Checkout Code
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2424
with:
2525
fetch-depth: 0
26-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
26+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2727
with:
2828
python-version: "3.x"
2929
- name: Install cffconvert

‎.github/workflows/codecov-validate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Validate codecov.yml
2323
steps:
2424
- name: Checkout Code
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
with:
2727
fetch-depth: 0
2828
- name: Validate with codecov API

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828
contents: write
2929

3030
steps:
31-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
fetch-depth: 0
3434

35-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
35+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
3636
with:
3737
python-version: "3.x"
3838

‎.github/workflows/generate-morphs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
fail-fast: false
3232

3333
steps:
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535

3636
- name: Set up Python
37-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
37+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
3838
with:
3939
python-version: "3.x"
4040

@@ -93,7 +93,7 @@ jobs:
9393
--target bullseye heart star \
9494
--workers 0
9595
96-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
96+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
9797
with:
9898
name: morphed-data-pr${{ github.event.number }}-${{ github.sha }}
9999
path: morphed_data

‎.github/workflows/pypi-publish.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
13+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1414
- name: Set up Python
15-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
15+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
1616
with:
1717
python-version: "3.x"
1818
- name: Install pypa/build
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build a binary wheel and a source tarball
2525
run: python3 -m build
2626
- name: Store the distribution packages
27-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
27+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
2828
with:
2929
name: python-package-distributions
3030
path: dist/
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Download all the dists
47-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
47+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
4848
with:
4949
name: python-package-distributions
5050
path: dist/
@@ -65,12 +65,12 @@ jobs:
6565

6666
steps:
6767
- name: Download all the dists
68-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
68+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
6969
with:
7070
name: python-package-distributions
7171
path: dist/
7272
- name: Sign the dists with Sigstore
73-
uses: sigstore/gh-action-sigstore-python@f832326173235dcb00dd5d92cd3f353de3188e6c # v3.1.0
73+
uses: sigstore/gh-action-sigstore-python@a5caf349bc536fbef3668a10ed7f5cd309a4b53d # v3.2.0
7474
with:
7575
inputs: >-
7676
./dist/*.tar.gz
@@ -110,7 +110,7 @@ jobs:
110110

111111
steps:
112112
- name: Download all the dists
113-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
113+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
114114
with:
115115
name: python-package-distributions
116116
path: dist/

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ repos:
2121
- id: rst-inline-touching-normal
2222

2323
- repo: https://github.com/codespell-project/codespell
24-
rev: v2.4.1
24+
rev: v2.4.2
2525
hooks:
2626
- id: codespell
2727
additional_dependencies:
2828
- tomli
2929
exclude: (\.(svg|png|pdf)$)|(CODE_OF_CONDUCT.md)
3030

3131
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.14.2
32+
rev: v0.15.12
3333
hooks:
3434
- id: ruff
3535
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
3636
- id: ruff-format
3737

3838
- repo: https://github.com/numpy/numpydoc
39-
rev: v1.9.0
39+
rev: v1.10.0
4040
hooks:
4141
- id: numpydoc-validation
4242
exclude: (tests|docs)/.*
@@ -48,7 +48,7 @@ repos:
4848
files: tests/.*
4949

5050
- repo: https://github.com/tox-dev/pyproject-fmt
51-
rev: v2.11.0
51+
rev: v2.21.1
5252
hooks:
5353
- id: pyproject-fmt
5454
args: [--keep-full-version, --no-print-diff]

‎pyproject.toml‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[build-system]
22
build-backend = "setuptools.build_meta"
3-
43
requires = [
54
"setuptools==78.1.1",
65
"setuptools-scm",
@@ -42,31 +41,27 @@ classifiers = [
4241
dynamic = [
4342
"version",
4443
]
45-
4644
dependencies = [
4745
"matplotlib>=3.10",
4846
"numpy>=1.23.0",
4947
"pandas>=2.1",
5048
"rich>=13.9.4",
5149
]
52-
5350
urls."Bug Tracker" = "https://github.com/stefmolin/data-morph/issues"
54-
urls."Documentation" = "https://stefaniemolin.com/data-morph/stable/api.html"
55-
urls."Homepage" = "https://stefaniemolin.com/data-morph"
56-
urls."Source" = "https://github.com/stefmolin/data-morph"
51+
urls.Documentation = "https://stefaniemolin.com/data-morph/stable/api.html"
52+
urls.Homepage = "https://stefaniemolin.com/data-morph"
53+
urls.Source = "https://github.com/stefmolin/data-morph"
5754
scripts.data-morph = "data_morph.cli:main"
5855

5956
[dependency-groups]
6057
dev = [ "pre-commit", { include-group = "docs" }, { include-group = "test" } ]
61-
6258
test = [
6359
"pytest>=8.3.4",
6460
"pytest-cov>=4.1.0",
6561
"pytest-mock>=3.10.0",
6662
"pytest-randomly>=3.12.0",
6763
"pytest-xdist>=3.6.1",
6864
]
69-
7065
docs = [
7166
"pydata-sphinx-theme>=0.15.3",
7267
"sphinx>=7.2.6",
@@ -75,21 +70,17 @@ docs = [
7570
"sphinx-design>=0.6.1",
7671
]
7772

78-
[tool.setuptools.packages.find]
79-
where = [
80-
"src",
81-
]
82-
83-
[tool.setuptools.package-data]
84-
"data_morph.data.starter_shapes" = [
73+
[tool.setuptools]
74+
dynamic.version = { attr = "data_morph.__version__" }
75+
package-data."data_morph.data.starter_shapes" = [
8576
"*",
8677
]
87-
"data_morph.plotting.config" = [
78+
package-data."data_morph.plotting.config" = [
8879
"*",
8980
]
90-
91-
[tool.setuptools.dynamic]
92-
version = { attr = "data_morph.__version__" }
81+
packages.find.where = [
82+
"src",
83+
]
9384

9485
[tool.ruff]
9586
line-length = 88
@@ -126,24 +117,22 @@ lint.ignore = [
126117
"E501", # line-too-long
127118
"TRY003", # avoid specifying long messages outside the exception class (revisit later and consider making custom exceptions)
128119
]
129-
130120
lint.extend-per-file-ignores."docs/*" = [
131121
"ANN",
132122
"ERA",
133-
] # docs build (allow commented code and don't require annotations)
134-
135-
lint.extend-per-file-ignores."tests/*" = [ "ANN" ] # don't require annotations for tests
123+
] # docs build (allow commented code and don't require annotations)
124+
lint.extend-per-file-ignores."tests/*" = [ "ANN" ] # don't require annotations for tests
136125
lint.isort.known-first-party = [
137126
"data_morph",
138127
]
139128
lint.isort.split-on-trailing-comma = false
140129

141130
[tool.codespell]
142131
ignore-words-list = "recuse"
143-
ignore-regex = 'https://([\w/\.])+'
132+
ignore-regex = "https://([\\w/\\.])+"
144133

145-
[tool.pytest.ini_options]
146-
addopts = [
134+
[tool.pytest]
135+
ini_options.addopts = [
147136
"-ra",
148137
"-l",
149138
"-v",
@@ -157,11 +146,11 @@ addopts = [
157146
"--no-cov-on-fail",
158147
"--cov-report=term-missing",
159148
]
160-
xfail_strict = true
161-
testpaths = [
149+
ini_options.xfail_strict = true
150+
ini_options.testpaths = [
162151
"tests",
163152
]
164-
markers = [
153+
ini_options.markers = [
165154
"bounds: Run tests on bounds logic.",
166155
"circles: Run tests on circular shapes.",
167156
"cli: Run tests involving the CLI.",
@@ -183,12 +172,12 @@ checks = [
183172
"SA01", # or a see also section
184173
"SS06", # and don't require the summary to fit on one line
185174
]
186-
exclude = [ # don't report on checks for these
187-
'\.__init__$',
188-
'\.__iter__$',
189-
'\.__repr__$',
190-
'\.__str__$',
175+
exclude = [ # don't report on checks for these
176+
"\\.__init__$",
177+
"\\.__iter__$",
178+
"\\.__repr__$",
179+
"\\.__str__$",
191180
]
192-
override_SS05 = [ # allow docstrings to start with these words
193-
'^Unambiguous ',
181+
override_SS05 = [ # allow docstrings to start with these words
182+
"^Unambiguous ",
194183
]

0 commit comments

Comments
 (0)