Skip to content

Commit dfeaebc

Browse files
ivanovacivanovac
authored
Merge branch 'master' into pr-by-releng-bot-1772642675
2 parents 0ce11da + 6550542 commit dfeaebc

File tree

592 files changed

+75633
-15985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+75633
-15985
lines changed

‎go.mod‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
module github.com/cloudfoundry/python-buildpack
22

3-
go 1.23.4
3+
go 1.24.0
44

55
require (
66
github.com/Dynatrace/libbuildpack-dynatrace v1.8.0
77
github.com/blang/semver v3.5.1+incompatible
8-
github.com/cloudfoundry/libbuildpack v0.0.0-20251202224209-b07cc3dab65e
8+
github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181
99
github.com/cloudfoundry/switchblade v0.9.4
1010
github.com/golang/mock v1.6.0
1111
github.com/kr/text v0.2.0
12-
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.36.2
12+
github.com/onsi/ginkgo/v2 v2.28.1
13+
github.com/onsi/gomega v1.39.0
1414
github.com/sclevine/spec v1.4.0
15-
golang.org/x/crypto v0.32.0
15+
golang.org/x/crypto v0.47.0
1616
gopkg.in/ini.v1 v1.67.0
1717
)
1818

1919
require (
2020
code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
2121
github.com/Masterminds/semver v1.5.0 // indirect
22+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2223
github.com/Microsoft/go-winio v0.6.2 // indirect
2324
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2425
github.com/containerd/log v0.1.0 // indirect
@@ -30,18 +31,19 @@ require (
3031
github.com/felixge/httpsnoop v1.0.4 // indirect
3132
github.com/fsnotify/fsnotify v1.8.0 // indirect
3233
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
33-
github.com/go-logr/logr v1.4.2 // indirect
34+
github.com/go-logr/logr v1.4.3 // indirect
3435
github.com/go-logr/stdr v1.2.2 // indirect
36+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3537
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/google/go-cmp v0.6.0 // indirect
38+
github.com/google/go-cmp v0.7.0 // indirect
39+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
3740
github.com/moby/docker-image-spec v1.3.1 // indirect
3841
github.com/nxadm/tail v1.4.11 // indirect
3942
github.com/opencontainers/go-digest v1.0.0 // indirect
4043
github.com/opencontainers/image-spec v1.1.0 // indirect
4144
github.com/paketo-buildpacks/packit v1.3.1 // indirect
4245
github.com/paketo-buildpacks/packit/v2 v2.16.0 // indirect
4346
github.com/pkg/errors v0.9.1 // indirect
44-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4547
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
4648
github.com/tidwall/gjson v1.18.0 // indirect
4749
github.com/tidwall/match v1.1.1 // indirect
@@ -53,14 +55,16 @@ require (
5355
go.opentelemetry.io/otel/metric v1.32.0 // indirect
5456
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
5557
go.opentelemetry.io/otel/trace v1.32.0 // indirect
56-
golang.org/x/net v0.34.0 // indirect
57-
golang.org/x/sys v0.29.0 // indirect
58-
golang.org/x/text v0.21.0 // indirect
58+
go.yaml.in/yaml/v3 v3.0.4 // indirect
59+
golang.org/x/mod v0.32.0 // indirect
60+
golang.org/x/net v0.49.0 // indirect
61+
golang.org/x/sync v0.19.0 // indirect
62+
golang.org/x/sys v0.40.0 // indirect
63+
golang.org/x/text v0.33.0 // indirect
64+
golang.org/x/tools v0.41.0 // indirect
5965
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6066
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
61-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6267
gopkg.in/yaml.v2 v2.4.0 // indirect
63-
gopkg.in/yaml.v3 v3.0.1 // indirect
6468
)
6569

6670
exclude google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd

‎go.sum‎

Lines changed: 48 additions & 24 deletions
Large diffs are not rendered by default.

‎manifest.yml‎

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependency_deprecation_dates:
2222
link: https://peps.python.org/pep-0719/
2323
- version_line: 3.14.x
2424
name: python
25-
date: 2030-10-31
25+
date: 2030-10-07
2626
link: https://peps.python.org/pep-0745/
2727
- version_line: 3.9.x
2828
name: python
@@ -65,13 +65,6 @@ dependencies:
6565
- cflinuxfs3
6666
source: https://github.com/conda-forge/miniforge/archive/refs/tags/24.7.1-0.tar.gz
6767
source_sha256: ca2f3cea67d6a1dbfd6acb9743891014768b12ad774755c57fbbcbfcd1fd8200
68-
- name: pip
69-
version: '25.2'
70-
uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_25.2_linux_noarch_any-stack_b15ae02f.tgz
71-
sha256: b15ae02f5b72bf9911bc550c7d8cf8210c26eff7047ba9f19446855ae8cb6749
72-
cf_stacks: []
73-
source: https://files.pythonhosted.org/packages/20/16/650289cd3f43d5a2fadfd98c68bd1e1e7f2550a1a5326768cddfbcedb2c5/pip-25.2.tar.gz
74-
source_sha256: 578283f006390f85bb6282dffb876454593d637f5d1be494b5202ce4877e71f2
7568
- name: pip
7669
version: '25.2'
7770
uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_25.2_linux_noarch_any-stack_7dc1e988.tgz
@@ -81,19 +74,13 @@ dependencies:
8174
- cflinuxfs3
8275
source: https://files.pythonhosted.org/packages/20/16/650289cd3f43d5a2fadfd98c68bd1e1e7f2550a1a5326768cddfbcedb2c5/pip-25.2.tar.gz
8376
source_sha256: 578283f006390f85bb6282dffb876454593d637f5d1be494b5202ce4877e71f2
84-
- name: pip
85-
version: '25.3'
86-
uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_25.3_linux_noarch_any-stack_d4b0c622.tgz
87-
sha256: d4b0c62226e36bfc5f63b719e14f335182d0afa1bc8842dfba804bbb307d47e6
88-
cf_stacks: []
89-
source: https://files.pythonhosted.org/packages/fe/6e/74a3f0179a4a73a53d66ce57fdb4de0080a8baa1de0063de206d6167acc2/pip-25.3.tar.gz
90-
source_sha256: 8d0538dbbd7babbd207f261ed969c65de439f6bc9e5dbd3b3b9a77f25d95f343
9177
- name: pip
9278
version: 26.0.1
9379
uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_26.0.1_linux_noarch_any-stack_6b1c4537.tgz
9480
sha256: 6b1c45371e9c813433dd73a5ce6abec88efc54b6d5cb3801ccaf36ae64617efe
9581
cf_stacks:
9682
- cflinuxfs5
83+
- cflinuxfs4
9784
source: https://files.pythonhosted.org/packages/48/83/0d7d4e9efe3344b8e2fe25d93be44f64b65364d3c8d7bc6dc90198d5422e/pip-26.0.1.tar.gz
9885
source_sha256: c4037d8a277c89b320abe636d59f91e6d0922d08a05b60e85e53b296613346d8
9986
- name: pipenv
@@ -106,12 +93,20 @@ dependencies:
10693
source_sha256: e8ea6105c1cdda7d5c19df7bd6439a006751f3d4e017602c791e7b51314adf84
10794
- name: pipenv
10895
version: 2026.0.3
109-
uri: https://buildpacks.cloudfoundry.org/dependencies/pipenv/pipenv_2026.0.3_linux_noarch_cflinuxfs4_082d293b.tgz
110-
sha256: '082d293bd8ab79b4674af1aa3812a6488654ad87e07cec63d73d67f9fbbdc131'
96+
uri: https://buildpacks.cloudfoundry.org/dependencies/pipenv/pipenv_2026.0.3_linux_noarch_cflinuxfs4_d8aebaca.tgz
97+
sha256: d8aebacaafc6a876704920748c4918443d3a07ae70e9039937bfbbfacf7e12d0
11198
cf_stacks:
11299
- cflinuxfs4
113100
source: https://files.pythonhosted.org/packages/90/03/8958464e0d366530477f07fd041ef6b9df56f3ea9c56d0db24cc8cd87fff/pipenv-2026.0.3.tar.gz
114101
source_sha256: 9a39d13a41ed8e4368ad50620941191f357319c8ffb7df45875c7c5dc6604ff6
102+
- name: pipenv
103+
version: 2026.0.3
104+
uri: https://buildpacks.cloudfoundry.org/dependencies/pipenv/pipenv_2026.0.3_linux_noarch_cflinuxfs5_23a2629d.tgz
105+
sha256: 23a2629da1873b0ffb25b79a5cce94263615437a7fc8a3be8f63550376ea6bd7
106+
cf_stacks:
107+
- cflinuxfs5
108+
source: https://files.pythonhosted.org/packages/90/03/8958464e0d366530477f07fd041ef6b9df56f3ea9c56d0db24cc8cd87fff/pipenv-2026.0.3.tar.gz
109+
source_sha256: 9a39d13a41ed8e4368ad50620941191f357319c8ffb7df45875c7c5dc6604ff6
115110
- name: python
116111
version: 3.9.24
117112
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.9.24_linux_x64_cflinuxfs3_e7fcaa7e.tgz
@@ -128,6 +123,14 @@ dependencies:
128123
- cflinuxfs4
129124
source: https://www.python.org/ftp/python/3.9.25/Python-3.9.25.tgz
130125
source_sha256: a7438eabd3a48139f42d4e058096af8d880b0bb6e8fb8c78838892e4ce5583f2
126+
- name: python
127+
version: 3.10.9
128+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.10.9_linux_x64_cflinuxfs5_2b1ef984.tgz
129+
sha256: 2b1ef9845d7f2a48ea757358b747a8a3b2620df008f6773bcede3ac4e171af59
130+
cf_stacks:
131+
- cflinuxfs5
132+
source: https://www.python.org/ftp/python/3.10.9/Python-3.10.9.tgz
133+
source_sha256: 4ccd7e46c8898f4c7862910a1703aa0e63525913a519abb2f55e26220a914d88
131134
- name: python
132135
version: 3.10.19
133136
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.10.19_linux_x64_cflinuxfs3_d754b71d.tgz
@@ -153,21 +156,37 @@ dependencies:
153156
source: https://www.python.org/ftp/python/3.11.14/Python-3.11.14.tgz
154157
source_sha256: 563d2a1b2a5ba5d5409b5ecd05a0e1bf9b028cf3e6a6f0c87a5dc8dc3f2d9182
155158
- name: python
156-
version: 3.11.14
157-
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.14_linux_x64_cflinuxfs4_66f53248.tgz
158-
sha256: 66f532488f868c421702755ad9e1e65e802b48f3881f1d198d66f9ff52ea463e
159+
version: 3.11.15
160+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.15_linux_x64_cflinuxfs4_830cc0e2.tgz
161+
sha256: 830cc0e2fb2b3232e683f415b5011314703ac58b4acd4e000976963788c94865
159162
cf_stacks:
160163
- cflinuxfs4
161-
source: https://www.python.org/ftp/python/3.11.14/Python-3.11.14.tgz
162-
source_sha256: 563d2a1b2a5ba5d5409b5ecd05a0e1bf9b028cf3e6a6f0c87a5dc8dc3f2d9182
164+
source: https://www.python.org/ftp/python/3.11.15/Python-3.11.15.tgz
165+
source_sha256: f4de1b10bd6c70cbb9fa1cd71fc5038b832747a74ee59d599c69ce4846defb50
163166
- name: python
164-
version: 3.12.12
165-
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.12.12_linux_x64_cflinuxfs4_3ae569b8.tgz
166-
sha256: 3ae569b8d1c5cd557fcf729153a86bbfaa0469e96390b67e6de24672b720d9e2
167+
version: 3.11.15
168+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.11.15_linux_x64_cflinuxfs5_ded45956.tgz
169+
sha256: ded45956efaaa20ecdd5914182b96ea47b3e9e82bc68fe1ea08820fa319689c4
170+
cf_stacks:
171+
- cflinuxfs5
172+
source: https://www.python.org/ftp/python/3.11.15/Python-3.11.15.tgz
173+
source_sha256: f4de1b10bd6c70cbb9fa1cd71fc5038b832747a74ee59d599c69ce4846defb50
174+
- name: python
175+
version: 3.12.13
176+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.12.13_linux_x64_cflinuxfs4_e63cf720.tgz
177+
sha256: e63cf720801bdc46dda0e1eac12465451317340ba39268b435e7b5bb5b398b89
167178
cf_stacks:
168179
- cflinuxfs4
169-
source: https://www.python.org/ftp/python/3.12.12/Python-3.12.12.tgz
170-
source_sha256: 487c908ddf4097a1b9ba859f25fe46d22ccaabfb335880faac305ac62bffb79b
180+
source: https://www.python.org/ftp/python/3.12.13/Python-3.12.13.tgz
181+
source_sha256: '0816c4761c97ecdb3f50a3924de0a93fd78cb63ee8e6c04201ddfaedca500b0b'
182+
- name: python
183+
version: 3.12.13
184+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.12.13_linux_x64_cflinuxfs5_3d4387ec.tgz
185+
sha256: 3d4387eceedf5d24d3a2d8b6098049d02ccd0bf413a4e02c73eba845284d86f0
186+
cf_stacks:
187+
- cflinuxfs5
188+
source: https://www.python.org/ftp/python/3.12.13/Python-3.12.13.tgz
189+
source_sha256: '0816c4761c97ecdb3f50a3924de0a93fd78cb63ee8e6c04201ddfaedca500b0b'
171190
- name: python
172191
version: 3.13.9
173192
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.9_linux_x64_cflinuxfs3_1c04ba8c.tgz
@@ -177,13 +196,21 @@ dependencies:
177196
source: https://www.python.org/ftp/python/3.13.9/Python-3.13.9.tgz
178197
source_sha256: c4c066af19c98fb7835d473bebd7e23be84f6e9874d47db9e39a68ee5d0ce35c
179198
- name: python
180-
version: 3.13.11
181-
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.11_linux_x64_cflinuxfs4_04d6f5a2.tgz
182-
sha256: 04d6f5a205d857a9d0d079d2784ca1201058ad8e22df14c311ca5cecf0ba58bf
199+
version: 3.13.12
200+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.12_linux_x64_cflinuxfs4_13421a49.tgz
201+
sha256: 13421a490598ca03f9242df1230023737d401a456c1b6429721f7e88607032b3
183202
cf_stacks:
184203
- cflinuxfs4
185-
source: https://www.python.org/ftp/python/3.13.11/Python-3.13.11.tgz
186-
source_sha256: 03cfedbe06ce21bc44ce09245e091a77f2fee9ec9be5c52069048a181300b202
204+
source: https://www.python.org/ftp/python/3.13.12/Python-3.13.12.tgz
205+
source_sha256: 12e7cb170ad2d1a69aee96a1cc7fc8de5b1e97a2bdac51683a3db016ec9a2996
206+
- name: python
207+
version: 3.13.12
208+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.13.12_linux_x64_cflinuxfs5_d923c02a.tgz
209+
sha256: d923c02aa27386583a1ecea31220a1aaadb7cc323be32dc8f71b1dd5ba81af62
210+
cf_stacks:
211+
- cflinuxfs5
212+
source: https://www.python.org/ftp/python/3.13.12/Python-3.13.12.tgz
213+
source_sha256: 12e7cb170ad2d1a69aee96a1cc7fc8de5b1e97a2bdac51683a3db016ec9a2996
187214
- name: python
188215
version: 3.14.2
189216
uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.2_linux_x64_cflinuxfs3_82c1798d.tgz
@@ -193,13 +220,21 @@ dependencies:
193220
source: https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz
194221
source_sha256: c609e078adab90e2c6bacb6afafacd5eaf60cd94cf670f1e159565725fcd448d
195222
- name: python
196-
version: 3.14.2
197-
uri: https://buildpack-dependencies.tanzu.vmware.com/cf/python/python_3.14.2_linux_x64_cflinuxfs4_f32bebd1.tgz
198-
sha256: f32bebd182dac46dc7a1a5782b4bc7e65dd67ba734d18eaf84b22487a4bede6e
223+
version: 3.14.3
224+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.14.3_linux_x64_cflinuxfs4_a54b3e20.tgz
225+
sha256: a54b3e20698a979d70fdc15af5a426b6bcf861ba6f37055e1da535c6562a8122
199226
cf_stacks:
200227
- cflinuxfs4
201-
source: https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz
202-
source_sha256: c609e078adab90e2c6bacb6afafacd5eaf60cd94cf670f1e159565725fcd448d
228+
source: https://www.python.org/ftp/python/3.14.3/Python-3.14.3.tgz
229+
source_sha256: d7fe130d0501ae047ca318fa92aa642603ab6f217901015a1df6ce650d5470cd
230+
- name: python
231+
version: 3.14.3
232+
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.14.3_linux_x64_cflinuxfs5_62e6a7a7.tgz
233+
sha256: 62e6a7a7a369c77412c1db87799128cd87a27bbfd14969c01ff4719a7bd7049f
234+
cf_stacks:
235+
- cflinuxfs5
236+
source: https://www.python.org/ftp/python/3.14.3/Python-3.14.3.tgz
237+
source_sha256: d7fe130d0501ae047ca318fa92aa642603ab6f217901015a1df6ce650d5470cd
203238
- name: setuptools
204239
version: 80.9.0
205240
uri: https://buildpacks.cloudfoundry.org/dependencies/setuptools/setuptools_80.9.0_linux_noarch_any-stack_db9ec7d3.tgz
@@ -210,13 +245,14 @@ dependencies:
210245
source: https://files.pythonhosted.org/packages/18/5d/3bf57dcd21979b887f014ea83c24ae194cfcd12b9e0fda66b957c69d1fca/setuptools-80.9.0.tar.gz
211246
source_sha256: f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
212247
- name: setuptools
213-
version: 80.10.1
214-
uri: https://buildpacks.cloudfoundry.org/dependencies/setuptools/setuptools_80.10.1_linux_noarch_any-stack_e8745ea3.tgz
215-
sha256: e8745ea31b2af10b2056552a65181b52f8fcc645f1ac13a4f6440525fcc896d1
248+
version: 82.0.0
249+
uri: https://buildpacks.cloudfoundry.org/dependencies/setuptools/setuptools_82.0.0_linux_noarch_any-stack_284f639c.tgz
250+
sha256: 284f639c6d85d6f159daa5eb35a28f0351f185ffebb50bd6deebf73d8d3ca444
216251
cf_stacks:
217252
- cflinuxfs4
218-
source: https://files.pythonhosted.org/packages/86/ff/f75651350db3cf2ef767371307eb163f3cc1ac03e16fdf3ac347607f7edb/setuptools-80.10.1.tar.gz
219-
source_sha256: bf2e513eb8144c3298a3bd28ab1a5edb739131ec5c22e045ff93cd7f5319703a
253+
- cflinuxfs5
254+
source: https://files.pythonhosted.org/packages/82/f3/748f4d6f65d1756b9ae577f329c951cda23fb900e4de9f70900ced962085/setuptools-82.0.0.tar.gz
255+
source_sha256: 22e0a2d69474c6ae4feb01951cb69d515ed23728cf96d05513d36e42b62b37cb
220256
include_files:
221257
- CHANGELOG
222258
- CONTRIBUTING.md

‎scripts/.util/tools.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function util::tools::ginkgo::install() {
4040
pushd /tmp > /dev/null || return
4141
GOBIN="${dir}" \
4242
go install \
43-
github.com/onsi/ginkgo/ginkgo@latest
43+
github.com/onsi/ginkgo/v2/ginkgo@latest
4444
popd > /dev/null || return
4545
fi
4646
}

‎src/python/brats/brats_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cloudfoundry/libbuildpack/bratshelper"
1313
"github.com/cloudfoundry/libbuildpack/cutlass"
1414

15-
. "github.com/onsi/ginkgo"
15+
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
)
1818

‎src/python/brats/brats_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package brats_test
33
import (
44
"github.com/cloudfoundry/libbuildpack/bratshelper"
55
"github.com/cloudfoundry/libbuildpack/cutlass"
6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
"golang.org/x/crypto/bcrypt"
99
)

‎src/python/conda/conda_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conda_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎src/python/conda/conda_test.go‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cloudfoundry/libbuildpack"
1212
"github.com/cloudfoundry/libbuildpack/ansicleaner"
1313
"github.com/golang/mock/gomock"
14-
. "github.com/onsi/ginkgo"
14+
. "github.com/onsi/ginkgo/v2"
1515
. "github.com/onsi/gomega"
1616
)
1717

@@ -37,10 +37,13 @@ var _ = Describe("Conda", func() {
3737
BeforeEach(func() {
3838
buildDir, err = os.MkdirTemp("", "python-buildpack.build.")
3939
Expect(err).To(BeNil())
40+
DeferCleanup(os.RemoveAll, buildDir)
4041
cacheDir, err = os.MkdirTemp("", "python-buildpack.cache.")
4142
Expect(err).To(BeNil())
43+
DeferCleanup(os.RemoveAll, cacheDir)
4244
depsDir, err = os.MkdirTemp("", "python-buildpack.deps.")
4345
Expect(err).To(BeNil())
46+
DeferCleanup(os.RemoveAll, depsDir)
4447
depsIdx = "13"
4548
depDir = filepath.Join(depsDir, depsIdx)
4649

@@ -59,13 +62,6 @@ var _ = Describe("Conda", func() {
5962
subject = conda.New(mockInstaller, mockStager, mockCommand, logger)
6063
})
6164

62-
AfterEach(func() {
63-
mockCtrl.Finish()
64-
Expect(os.RemoveAll(buildDir)).To(Succeed())
65-
Expect(os.RemoveAll(cacheDir)).To(Succeed())
66-
Expect(os.RemoveAll(depsDir)).To(Succeed())
67-
})
68-
6965
Describe("Version", func() {
7066
Context("runtime.txt specifies python 3", func() {
7167
BeforeEach(func() {
@@ -129,13 +125,12 @@ var _ = Describe("Conda", func() {
129125

130126
BeforeEach(func() {
131127
condaPkgs = os.Getenv("CONDA_PKGS_DIRS")
132-
})
133-
134-
AfterEach(func() {
135-
if condaPkgs != "" {
136-
os.Setenv("CONDA_PKGS_DIRS", condaPkgs)
137-
}
138-
os.Unsetenv("BP_DEBUG")
128+
DeferCleanup(func() {
129+
if condaPkgs != "" {
130+
os.Setenv("CONDA_PKGS_DIRS", condaPkgs)
131+
}
132+
os.Unsetenv("BP_DEBUG")
133+
})
139134
})
140135

141136
It("uses staging cache for conda cache", func() {

‎src/python/finalize/cli/cli_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎src/python/finalize/finalize.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ func (f *Finalizer) HandleCollectstatic() error {
9595
f.Log.Info("Running python %s collectstatic --noinput --traceback", managePyPath)
9696
output := new(bytes.Buffer)
9797
if err = f.Command.Execute(f.Stager.BuildDir(), output, text.NewIndentWriter(os.Stderr, []byte(" ")), "python", managePyPath, "collectstatic", "--noinput", "--traceback"); err != nil {
98-
f.Log.Error(fmt.Sprintf(` ! Error while running '$ python %s collectstatic --noinput'.
98+
f.Log.Error(` ! Error while running '$ python %s collectstatic --noinput'.
9999
See traceback above for details.
100100
101101
You may need to update application code to resolve this error.
102102
Or, you can disable collectstatic for this application:
103103
104104
$ cf set-env <app> DISABLE_COLLECTSTATIC 1
105105
106-
https://devcenter.heroku.com/articles/django-assets`, managePyPath))
106+
https://devcenter.heroku.com/articles/django-assets`, managePyPath)
107107
return err
108108
}
109109

0 commit comments

Comments
 (0)