Skip to content

Commit 6858bab

Browse files
aKlimauaKlimau
committed
Merge main into no-traceback-exception
2 parents 320a4d1 + 4464836 commit 6858bab

File tree

6 files changed

+193
-37
lines changed

6 files changed

+193
-37
lines changed

‎.github/workflows/update_ci.yml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -105,37 +105,6 @@ jobs:
105105
env:
106106
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
107107
continue-on-error: true
108-
- uses: "actions/checkout@v4"
109-
with:
110-
fetch-depth: 0
111-
path: "pulpcore"
112-
ref: "3.39"
113-
114-
- name: "Run update"
115-
working-directory: "pulpcore"
116-
run: |
117-
../plugin_template/scripts/update_ci.sh --release
118-
119-
- name: "Create Pull Request for CI files"
120-
uses: "peter-evans/create-pull-request@v6"
121-
id: "create_pr_3_39"
122-
with:
123-
token: "${{ secrets.RELEASE_TOKEN }}"
124-
path: "pulpcore"
125-
committer: "pulpbot <pulp-infra@redhat.com>"
126-
author: "pulpbot <pulp-infra@redhat.com>"
127-
title: "Update CI files for branch 3.39"
128-
branch: "update-ci/3.39"
129-
base: "3.39"
130-
delete-branch: true
131-
- name: "Mark PR automerge"
132-
working-directory: "pulpcore"
133-
run: |
134-
gh pr merge --rebase --auto "${{ steps.create_pr_3_39.outputs.pull-request-number }}"
135-
if: "steps.create_pr_3_39.outputs.pull-request-number"
136-
env:
137-
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
138-
continue-on-error: true
139108
- uses: "actions/checkout@v4"
140109
with:
141110
fetch-depth: 0

‎CHANGES.md‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,49 @@
88

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

11+
## 3.95.3 (2025-12-17) {: #3.95.3 }
12+
13+
### REST API {: #3.95.3-rest-api }
14+
15+
#### Bugfixes {: #3.95.3-rest-api-bugfix }
16+
17+
- Fixed file handle leak when content app access triggers downloads due to on_demand or streamed policy.
18+
[#7157](https://github.com/pulp/pulpcore/issues/7157)
19+
20+
### Plugin API {: #3.95.3-plugin-api }
21+
22+
No significant changes.
23+
24+
### Pulp File {: #3.95.3-pulp-file }
25+
26+
No significant changes.
27+
28+
### Pulp Cert Guard {: #3.95.3-pulp-cert-guard }
29+
30+
No significant changes.
31+
32+
---
33+
34+
## 3.95.2 (2025-12-11) {: #3.95.2 }
35+
36+
### REST API {: #3.95.2-rest-api }
37+
38+
No significant changes.
39+
40+
### Plugin API {: #3.95.2-plugin-api }
41+
42+
No significant changes.
43+
44+
### Pulp File {: #3.95.2-pulp-file }
45+
46+
No significant changes.
47+
48+
### Pulp Cert Guard {: #3.95.2-pulp-cert-guard }
49+
50+
No significant changes.
51+
52+
---
53+
1154
## 3.95.1 (2025-12-09) {: #3.95.1 }
1255

1356
### REST API {: #3.95.1-rest-api }
@@ -547,6 +590,73 @@ No significant changes.
547590

548591
---
549592

593+
## 3.85.7 (2025-12-22) {: #3.85.7 }
594+
595+
### REST API {: #3.85.7-rest-api }
596+
597+
No significant changes.
598+
599+
### Plugin API {: #3.85.7-plugin-api }
600+
601+
#### Bugfixes {: #3.85.7-plugin-api-bugfix }
602+
603+
- Exposed `RepositoryVersionSerializer` to the plugin API.
604+
In some cases a plugin might have used that serializer for a newer pulpcore version
605+
but it could also be installed with a lower pulpcore version.
606+
607+
### Pulp File {: #3.85.7-pulp-file }
608+
609+
No significant changes.
610+
611+
### Pulp Cert Guard {: #3.85.7-pulp-cert-guard }
612+
613+
No significant changes.
614+
615+
---
616+
617+
## 3.85.6 (2025-12-17) {: #3.85.6 }
618+
619+
### REST API {: #3.85.6-rest-api }
620+
621+
#### Bugfixes {: #3.85.6-rest-api-bugfix }
622+
623+
- Fixed file handle leak when content app access triggers downloads due to on_demand or streamed policy.
624+
[#7157](https://github.com/pulp/pulpcore/issues/7157)
625+
626+
### Plugin API {: #3.85.6-plugin-api }
627+
628+
No significant changes.
629+
630+
### Pulp File {: #3.85.6-pulp-file }
631+
632+
No significant changes.
633+
634+
### Pulp Cert Guard {: #3.85.6-pulp-cert-guard }
635+
636+
No significant changes.
637+
638+
---
639+
640+
## 3.85.5 (2025-12-11) {: #3.85.5 }
641+
642+
### REST API {: #3.85.5-rest-api }
643+
644+
No significant changes.
645+
646+
### Plugin API {: #3.85.5-plugin-api }
647+
648+
No significant changes.
649+
650+
### Pulp File {: #3.85.5-pulp-file }
651+
652+
No significant changes.
653+
654+
### Pulp Cert Guard {: #3.85.5-pulp-cert-guard }
655+
656+
No significant changes.
657+
658+
---
659+
550660
## 3.85.4 (2025-12-09) {: #3.85.4 }
551661

552662
### REST API {: #3.85.4-rest-api }
@@ -1402,6 +1512,30 @@ No significant changes.
14021512

14031513
---
14041514

1515+
## 3.73.21 (2025-12-22) {: #3.73.21 }
1516+
1517+
### REST API {: #3.73.21-rest-api }
1518+
1519+
No significant changes.
1520+
1521+
### Plugin API {: #3.73.21-plugin-api }
1522+
1523+
#### Bugfixes {: #3.73.21-plugin-api-bugfix }
1524+
1525+
- Exposed `RepositoryVersionSerializer` to the plugin API.
1526+
In some cases a plugin might have used that serializer for a newer pulpcore version
1527+
but it could also be installed with a lower pulpcore version.
1528+
1529+
### Pulp File {: #3.73.21-pulp-file }
1530+
1531+
No significant changes.
1532+
1533+
### Pulp Cert Guard {: #3.73.21-pulp-cert-guard }
1534+
1535+
No significant changes.
1536+
1537+
---
1538+
14051539
## 3.73.20 (2025-12-09) {: #3.73.20 }
14061540

14071541
### REST API {: #3.73.20-rest-api }
@@ -2552,6 +2686,30 @@ No significant changes.
25522686

25532687
---
25542688

2689+
## 3.63.28 (2025-12-22) {: #3.63.28 }
2690+
2691+
### REST API {: #3.63.28-rest-api }
2692+
2693+
No significant changes.
2694+
2695+
### Plugin API {: #3.63.28-plugin-api }
2696+
2697+
#### Bugfixes {: #3.63.28-plugin-api-bugfix }
2698+
2699+
- Exposed `RepositoryVersionSerializer` to the plugin API.
2700+
In some cases a plugin might have used that serializer for a newer pulpcore version
2701+
but it could also be installed with a lower pulpcore version.
2702+
2703+
### Pulp File {: #3.63.28-pulp-file }
2704+
2705+
No significant changes.
2706+
2707+
### Pulp Cert Guard {: #3.63.28-pulp-cert-guard }
2708+
2709+
No significant changes.
2710+
2711+
---
2712+
25552713
## 3.63.27 (2025-12-09) {: #3.63.27 }
25562714

25572715
### REST API {: #3.63.27-rest-api }
@@ -4013,6 +4171,30 @@ No significant changes.
40134171

40144172
---
40154173

4174+
## 3.49.49 (2025-12-22) {: #3.49.49 }
4175+
4176+
### REST API {: #3.49.49-rest-api }
4177+
4178+
No significant changes.
4179+
4180+
### Plugin API {: #3.49.49-plugin-api }
4181+
4182+
#### Bugfixes {: #3.49.49-plugin-api-bugfix }
4183+
4184+
- Exposed `RepositoryVersionSerializer` to the plugin API.
4185+
In some cases a plugin might have used that serializer for a newer pulpcore version
4186+
but it could also be installed with a lower pulpcore version.
4187+
4188+
### Pulp File {: #3.49.49-pulp-file }
4189+
4190+
No significant changes.
4191+
4192+
### Pulp Cert Guard {: #3.49.49-pulp-cert-guard }
4193+
4194+
No significant changes.
4195+
4196+
---
4197+
40164198
## 3.49.48 (2025-12-09) {: #3.49.48 }
40174199

40184200
### REST API {: #3.49.48-rest-api }

‎CHANGES/7157.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed file handle leak when content app access triggers downloads due to on_demand or streamed policy.

‎pulpcore/content/handler.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,12 @@ async def finalize():
13351335
"on-demand-downloading/#on-demand-and-streamed-limitations>"
13361336
)
13371337

1338+
# manually close the DownloadFactory's (HTTP-)session, the next artifact-download will
1339+
# create a new DownloadFactory anyway because it will use a new remote-object.
1340+
# Leaving it open also left open file-descriptors to /dev/urandom. Most likely these FDs are
1341+
# held by the underlying SSL library.
1342+
await downloader.session.close()
1343+
13381344
if save_artifact and remote.policy != Remote.STREAMED:
13391345
content_artifacts = await asyncio.shield(
13401346
sync_to_async(self._save_artifact)(download_result, remote_artifact, request)

‎pyproject.toml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ dependencies = [
4848
"json_stream>=2.3.2,<2.5",
4949
"jq>=1.6.0,<1.11.0",
5050
"PyOpenSSL<26.0",
51-
"opentelemetry-api>=1.27.0,<1.39",
52-
"opentelemetry-sdk>=1.27.0,<1.39",
53-
"opentelemetry-exporter-otlp-proto-http>=1.27.0,<1.39",
51+
"opentelemetry-api>=1.27.0,<1.40",
52+
"opentelemetry-sdk>=1.27.0,<1.40",
53+
"opentelemetry-exporter-otlp-proto-http>=1.27.0,<1.40",
5454
"protobuf>=4.21.1,<7.0",
5555
"pulp-glue>=0.30.0,<0.37",
5656
"pygtrie>=2.5,<=2.5.0",
5757
"psycopg[binary]>=3.1.8,<3.4", # SemVer, not explicitely stated, but mentioned on multiple changes.
58-
"pycares>=4.0.0,<5.0", # Explicit dependency to ensure compatibility with aiodns.
59-
"pyparsing>=3.1.0,<3.3", # Looks like only bugfixes in z-Stream.
58+
"pyparsing>=3.1.0,<3.4", # Looks like only bugfixes in z-Stream.
6059
"python-gnupg>=0.5.0,<0.6", # Looks like only bugfixes in z-Stream [changelog only in git]
6160
"PyYAML>=5.1.1,<6.1", # Looks like only bugfixes in z-Stream.
6261
"redis>=4.3.0,<7.2", # Looks like only bugfixes in z-Stream.

‎template_config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ stalebot_days_until_stale: 90
128128
stalebot_limit_to_pulls: true
129129
supported_release_branches:
130130
- '3.28'
131-
- '3.39'
132131
- '3.49'
133132
- '3.63'
134133
- '3.73'

0 commit comments

Comments
 (0)