Skip to content

Commit cb0b649

Browse files
JayBazuziisidore
andcommitted
! r rename approvaltests-minimal -> approvaltests_minimal
To comply with PEP 625 Fix #221 Co-Authored-By: Llewellyn Falco <llewellyn.falco@gmail.com>
1 parent b0d939b commit cb0b649

8 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/publish_to_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
env:
4848
TWINE_USERNAME: __token__
4949
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
50-
- run: setup/publish.approvaltests-minimal.sh
50+
- run: setup/publish.approvaltests_minimal.sh
5151
env:
5252
TWINE_USERNAME: __token__
5353
TWINE_PASSWORD: ${{ secrets.PYPI_APPROVALTESTS_MINIMAL }}

.github/workflows/test_current_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- "3.13"
2323
- "3.14"
2424
os: [macos-latest, ubuntu-latest, windows-latest]
25-
package: [approvaltests, approvaltests-minimal]
25+
package: [approvaltests, approvaltests_minimal]
2626

2727
steps:
2828
- uses: actions/checkout@v6

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ typing_extensions>=3.6.2
298298

299299
These dependencies are needed if you are going to use the related functionality.
300300
If you want the bare minimum you can use the pypi project
301-
[approvaltests-minimal](https://pypi.org/project/approvaltests-minimal/).
301+
[approvaltests_minimal](https://pypi.org/project/approvaltests-minimal/).
302302

303303
<!-- snippet: requirements.prod.extras.txt -->
304304
<a id='snippet-requirements.prod.extras.txt'></a>

internal_documentation/micro_features/build_system_migration.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Repository Root (ApprovalTests.Python)
3434
│ │ ├── Includes: required + extras deps
3535
│ │ └── Uses: setup_utils.setup_approvaltests()
3636
│ │
37-
│ ├── setup.approvaltests-minimal.py # Variant: approvaltests-minimal
37+
│ ├── setup.approvaltests_minimal.py # Variant: approvaltests_minimal
3838
│ │ ├── Includes: required deps only
3939
│ │ ├── Optional: extras via extras_require
4040
│ │ └── Uses: setup_utils.setup_approvaltests()
@@ -51,8 +51,8 @@ Repository Root (ApprovalTests.Python)
5151
│ ├── publish.approvaltests.sh
5252
│ │ └── Runs: setup.approvaltests.py
5353
│ │
54-
│ ├── publish.approvaltests-minimal.sh
55-
│ │ └── Runs: setup.approvaltests-minimal.py
54+
│ ├── publish.approvaltests_minimal.sh
55+
│ │ └── Runs: setup.approvaltests_minimal.py
5656
│ │
5757
│ └── publish.approval_utilities.sh
5858
│ ├── Swaps: setup.py ↔ setup.approval_utilities.py
@@ -67,7 +67,7 @@ Published Packages (to PyPI):
6767
┌─────────────────────────────────────────────────────────┐
6868
│ 1. approval_utilities (standalone utility package) │
6969
│ 2. approvaltests (full, depends on #1) │
70-
│ 3. approvaltests-minimal (minimal, no #1 dependency) │
70+
│ 3. approvaltests_minimal (minimal, no #1 dependency) │
7171
└─────────────────────────────────────────────────────────┘
7272
```
7373

@@ -92,7 +92,7 @@ Published Packages (to PyPI):
9292
│ │ │
9393
┌────────▼────────┐ ┌────────▼────────┐ ┌────────▼────────┐
9494
│ File Swapping │ │ Direct Build │ │ Direct Build │
95-
│ (setup.py hack) │ │ (setup.approvaltests) │ │ (setup.approvaltests-minimal) │
95+
│ (setup.py hack) │ │ (setup.approvaltests) │ │ (setup.approvaltests_minimal) │
9696
└────────┬────────┘ └────────┬────────┘ └────────┬────────┘
9797
<!-- │ │ │ -->
9898
┌────────▼────────┐ ┌────────▼────────┐ ┌────────▼────────┐
@@ -121,7 +121,7 @@ Published Packages (to PyPI):
121121
122122
Order Dependency: approval_utilities ──must publish before──► approvaltests (full)
123123
124-
Same Source: approvaltests (full) ═══ same code ═══ approvaltests-minimal
124+
Same Source: approvaltests (full) ═══ same code ═══ approvaltests_minimal
125125
(only dependency configuration differs)
126126
```
127127

@@ -158,7 +158,7 @@ Same Source: approvaltests (full) ═══ same code ═══ approval
158158
├─► publish.approvaltests.sh
159159
│ └─► Auth: secrets.PYPI_PASSWORD
160160
161-
└─► publish.approvaltests-minimal.sh
161+
└─► publish.approvaltests_minimal.sh
162162
└─► Auth: secrets.PYPI_APPROVALTESTS_MINIMAL
163163
```
164164

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["setuptools", "wheel"]
2+
requires = ["setuptools>=69.0.0", "wheel"]
33
build-backend = "setuptools.build_meta"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
cp setup/setup.approvaltests-minimal.py setup.py
3+
cp setup/setup.approvaltests_minimal.py setup.py
44
python -m build .
55
rm setup.py
66
twine upload --repository-url ${TWINE_REPOSITORY_URL} dist/*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616

1717
setup_approvaltests(
18-
package_name="approvaltests-minimal",
18+
package_name="approvaltests_minimal",
1919
package_description="Assertion/verification library to aid testing with the minimal required dependencies + the ability to opt in for the others ",
2020
required=required,
2121
extra_requires=extra_requires,

test__mypy_accepts_our_packages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
PACKAGES = [
99
("approval_utilities", "setup.approval_utilities.py"),
1010
("approvaltests", "setup.approvaltests.py"),
11-
("approvaltests", "setup.approvaltests-minimal.py"),
11+
("approvaltests", "setup.approvaltests_minimal.py"),
1212
]
1313

1414

0 commit comments

Comments
 (0)