Skip to content

Commit 08f2e99

Browse files
committed
Update pyproject and CI related files.
* Fixes the CHANGES.md file. * Update template_config file with the latest_release_branch correct value. * Update the template_config properly. * Set the PATCH for the pulpcore lowerbound limit. * Point to the proper migration that introduced domains into pulpcore.
1 parent 8c7bf97 commit 08f2e99

9 files changed

+34
-27
lines changed

.ci/scripts/calc_constraints.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ def to_lower_bound(req):
8383
else:
8484
for spec in requirement.specifier:
8585
if spec.operator == ">=":
86+
min_version = spec.version
8687
if requirement.name == "pulpcore":
8788
# Currently an exception to allow for pulpcore bugfix releases.
8889
# TODO Semver libraries should be allowed too.
8990
operator = "~="
91+
if len(Version(min_version).release) != 3:
92+
raise RuntimeError("Pulpcore lower bound must be in the form '>=x.y.z'.")
9093
else:
9194
operator = "=="
92-
min_version = spec.version
9395
return f"{requirement.name}{operator}{min_version}"
9496
return f"# NO LOWER BOUND: {req}"
9597

.github/template_gitref

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
unknown
1+
2021.08.26-429-gaaf6899

.github/workflows/ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
run: |
4444
.github/workflows/scripts/check_commit.sh
4545
46+
docs:
47+
uses: "./.github/workflows/docs.yml"
48+
4649
lint:
4750
uses: "./.github/workflows/lint.yml"
4851

@@ -84,6 +87,7 @@ jobs:
8487
- "check-commits"
8588
- "lint"
8689
- "test"
90+
- "docs"
8791
if: "always()"
8892
steps:
8993
- name: "Collect needed jobs results"

.github/workflows/scripts/before_script.sh

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
3232
echo "Containerfile:"
3333
tail -v -n +1 .ci/ansible/Containerfile
3434

35+
echo "Constraints Files:"
36+
# The need not even exist.
37+
tail -v -n +1 ../*/*constraints.txt || true
38+
3539
# Needed for some functional tests
3640
cmd_prefix bash -c "echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
3741
cmd_prefix bash -c "usermod -a -G wheel pulp"

.github/workflows/scripts/script.sh

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export PULP_URL="https://pulp"
2828

2929
REPORTED_STATUS="$(pulp status)"
3030

31+
echo "${REPORTED_STATUS}"
32+
3133
echo "machine pulp
3234
login admin
3335
password password

CHANGES.md

+11-18
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,28 @@
88

99
[//]: # (towncrier release notes start)
1010

11-
## 0.1.0a4 (2022-06-27)
12-
13-
### Bugfixes
11+
## 0.2.0 (2025-02-20) {: #0.2.0 }
1412

15-
- Remove scheme from apache snippet
16-
[#8574](https://pulp.plan.io/issues/8574)
17-
- Adjusted the use of `dispatch` for pulpcore>=3.15. Also bumped the dependency.
18-
[#9533](https://pulp.plan.io/issues/9533)
13+
#### Features {: #0.2.0-feature }
1914

20-
---
15+
- Added pull-through cache feature.
16+
[#278](https://github.com/pulp/pulp_npm/issues/278)
2117

22-
## 0.1.0a3 (2021-03-17)
18+
#### Misc {: #0.2.0-misc }
2319

24-
No significant changes.
20+
- [#128](https://github.com/pulp/pulp_npm/issues/128)
2521

2622
---
2723

28-
## 0.1.0a2 (2020-11-25)
24+
### Bugfixes
2925

30-
No significant changes.
26+
- Remove scheme from apache snippet
27+
[#8574](https://pulp.plan.io/issues/8574)
28+
- Adjusted the use of `dispatch` for pulpcore>=3.15. Also bumped the dependency.
29+
[#9533](https://pulp.plan.io/issues/9533)
3130

3231
---
3332

34-
## 0.1.0a1 (2020-11-18)
35-
36-
### Features
37-
38-
- Download a package with its dependencies
39-
[#6004](https://pulp.plan.io/issues/6004)
4033
## 0.1.0 (2025-02-14) {: #0.1.0 }
4134

4235
#### Features {: #0.1.0-feature }

pulp_npm/app/migrations/0004_alter_package_unique_together_package__pulp_domain_and_more.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('core', '0126_remoteartifact_failed_at'),
11+
('core', '0101_add_domain'),
1212
('npm', '0003_alter_npmdistribution_distribution_ptr_and_more'),
1313
]
1414

pyproject.toml

+7-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ classifiers=[
1919
"Framework :: Django",
2020
"Programming Language :: Python",
2121
"Programming Language :: Python :: 3",
22-
"Programming Language :: Python :: 3.8",
2322
"Programming Language :: Python :: 3.9",
23+
"Programming Language :: Python :: 3.10",
24+
"Programming Language :: Python :: 3.11",
25+
"Programming Language :: Python :: 3.12",
2426
]
25-
requires-python = ">=3.6"
27+
requires-python = ">=3.9"
2628
dependencies = [
27-
"pulpcore>=3.49,<3.85",
29+
"pulpcore>=3.49.32,<3.85",
2830
]
2931

3032
[project.urls]
@@ -66,7 +68,7 @@ ignore = [
6668

6769
[tool.black]
6870
line-length = 100
69-
target-version = ["py36", "py37", "py38"]
71+
target-version = ["py39"]
7072
exclude = '''
7173
/(
7274
\.eggs
@@ -127,4 +129,4 @@ replace = "version = \"{new_version}\""
127129

128130
filename = "./pyproject.toml"
129131
search = "version = \"{current_version}\""
130-
replace = "version = \"{new_version}\""
132+
replace = "version = \"{new_version}\""

template_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This config represents the latest values used when running the plugin-template. Any settings that
22
# were not present before running plugin-template have been added with their default values.
33

4-
# generated with plugin_template@unknown
4+
# generated with plugin_template@2021.08.26-429-gaaf6899
55

66
api_root: /pulp/
77
black: true

0 commit comments

Comments
 (0)