Skip to content

Commit 2c75d4c

Browse files
sgaistsgaist
committed
chore: update code to retrieve python-package-managers-install rather than the old name
Also update all the related test code.
1 parent 7d6d131 commit 2c75d4c

20 files changed

+79
-79
lines changed

‎init_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/sclevine/spec/report"
1313
)
1414

15-
func TestUnitPythonPackagers(t *testing.T) {
15+
func TestUnitPythonPackageManagersRun(t *testing.T) {
1616
suite := spec.New("python-package-managers-run", spec.Report(report.Terminal{}), spec.Sequential())
1717
suite("PyProjectHandler", testPyProjectHandler)
1818
suite("Detect", testDetect)

‎integration.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"index.docker.io/paketobuildpacks/ubuntu-noble-builder-buildpackless:latest"
66
],
77
"cpython": "index.docker.io/paketobuildpacks/cpython",
8-
"python-installers": "github.com/idiap/python-installers",
8+
"python-package-managers-install": "index.docker.io/paketobuildpacks/python-package-managers-install",
99
"build-plan": "index.docker.io/paketocommunity/build-plan"
1010
}

‎integration/helpers.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ type TestSettings struct {
3131
Online string
3232
Offline string
3333
}
34-
PythonInstallers struct {
34+
PythonPackageManagersInstall struct {
3535
Online string
3636
Offline string
3737
}
3838
BuildPlan struct {
3939
Online string
4040
}
4141
// This buildpack
42-
PythonPackagers struct {
42+
PythonPackageManagersRun struct {
4343
Online string
4444
Offline string
4545
}
4646
}
4747

4848
Config struct {
49-
CPython string `json:"cpython"`
50-
PythonInstallers string `json:"python-installers"`
51-
BuildPlan string `json:"build-plan"`
49+
CPython string `json:"cpython"`
50+
PythonPackageManagersInstall string `json:"python-package-managers-install"`
51+
BuildPlan string `json:"build-plan"`
5252
}
5353
}

‎integration/packagers/conda_default_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ func condaTestDefault(t *testing.T, context spec.G, it spec.S) {
6262
image, logs, err = pack.WithNoColor().Build.
6363
WithPullPolicy("never").
6464
WithBuildpacks(
65-
settings.Buildpacks.PythonInstallers.Online,
66-
settings.Buildpacks.PythonPackagers.Online,
65+
settings.Buildpacks.PythonPackageManagersInstall.Online,
66+
settings.Buildpacks.PythonPackageManagersRun.Online,
6767
settings.Buildpacks.BuildPlan.Online,
6868
).
6969
Execute(name, source)
@@ -106,8 +106,8 @@ func condaTestDefault(t *testing.T, context spec.G, it spec.S) {
106106
image, logs, err = pack.WithNoColor().Build.
107107
WithPullPolicy("never").
108108
WithBuildpacks(
109-
settings.Buildpacks.PythonInstallers.Online,
110-
settings.Buildpacks.PythonPackagers.Online,
109+
settings.Buildpacks.PythonPackageManagersInstall.Online,
110+
settings.Buildpacks.PythonPackageManagersRun.Online,
111111
settings.Buildpacks.BuildPlan.Online,
112112
).
113113
WithEnv(map[string]string{

‎integration/packagers/conda_layer_reuse_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ func condaTestLayerReuse(t *testing.T, context spec.G, it spec.S) {
7474
firstImage, logs, err = pack.WithNoColor().Build.
7575
WithPullPolicy("never").
7676
WithBuildpacks(
77-
settings.Buildpacks.PythonInstallers.Online,
78-
settings.Buildpacks.PythonPackagers.Online,
77+
settings.Buildpacks.PythonPackageManagersInstall.Online,
78+
settings.Buildpacks.PythonPackageManagersRun.Online,
7979
settings.Buildpacks.BuildPlan.Online,
8080
).
8181
Execute(name, source)
@@ -98,8 +98,8 @@ func condaTestLayerReuse(t *testing.T, context spec.G, it spec.S) {
9898
secondImage, logs, err = pack.WithNoColor().Build.
9999
WithPullPolicy("never").
100100
WithBuildpacks(
101-
settings.Buildpacks.PythonInstallers.Online,
102-
settings.Buildpacks.PythonPackagers.Online,
101+
settings.Buildpacks.PythonPackageManagersInstall.Online,
102+
settings.Buildpacks.PythonPackageManagersRun.Online,
103103
settings.Buildpacks.BuildPlan.Online,
104104
).
105105
Execute(name, source)
@@ -139,8 +139,8 @@ func condaTestLayerReuse(t *testing.T, context spec.G, it spec.S) {
139139
firstImage, logs, err = pack.WithNoColor().Build.
140140
WithPullPolicy("never").
141141
WithBuildpacks(
142-
settings.Buildpacks.PythonInstallers.Online,
143-
settings.Buildpacks.PythonPackagers.Online,
142+
settings.Buildpacks.PythonPackageManagersInstall.Online,
143+
settings.Buildpacks.PythonPackageManagersRun.Online,
144144
settings.Buildpacks.BuildPlan.Online,
145145
).
146146
Execute(name, source)
@@ -163,8 +163,8 @@ func condaTestLayerReuse(t *testing.T, context spec.G, it spec.S) {
163163
secondImage, logs, err = pack.WithNoColor().Build.
164164
WithPullPolicy("never").
165165
WithBuildpacks(
166-
settings.Buildpacks.PythonInstallers.Online,
167-
settings.Buildpacks.PythonPackagers.Online,
166+
settings.Buildpacks.PythonPackageManagersInstall.Online,
167+
settings.Buildpacks.PythonPackageManagersRun.Online,
168168
settings.Buildpacks.BuildPlan.Online,
169169
).
170170
Execute(name, source)

‎integration/packagers/conda_lock_file_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ func condaTestLockFile(t *testing.T, context spec.G, it spec.S) {
6363
image, logs, err = pack.WithNoColor().Build.
6464
WithPullPolicy("never").
6565
WithBuildpacks(
66-
settings.Buildpacks.PythonInstallers.Online,
67-
settings.Buildpacks.PythonPackagers.Online,
66+
settings.Buildpacks.PythonPackageManagersInstall.Online,
67+
settings.Buildpacks.PythonPackageManagersRun.Online,
6868
settings.Buildpacks.BuildPlan.Online,
6969
).
7070
Execute(name, source)

‎integration/packagers/conda_logging_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func condaTestLogging(t *testing.T, context spec.G, it spec.S) {
6060
image, logs, err := pack.WithNoColor().Build.
6161
WithPullPolicy("never").
6262
WithBuildpacks(
63-
settings.Buildpacks.PythonInstallers.Online,
64-
settings.Buildpacks.PythonPackagers.Online,
63+
settings.Buildpacks.PythonPackageManagersInstall.Online,
64+
settings.Buildpacks.PythonPackageManagersRun.Online,
6565
settings.Buildpacks.BuildPlan.Online,
6666
).
6767
Execute(name, source)
@@ -99,8 +99,8 @@ func condaTestLogging(t *testing.T, context spec.G, it spec.S) {
9999
image, logs, err := pack.WithNoColor().Build.
100100
WithPullPolicy("never").
101101
WithBuildpacks(
102-
settings.Buildpacks.PythonInstallers.Online,
103-
settings.Buildpacks.PythonPackagers.Online,
102+
settings.Buildpacks.PythonPackageManagersInstall.Online,
103+
settings.Buildpacks.PythonPackageManagersRun.Online,
104104
settings.Buildpacks.BuildPlan.Online,
105105
).
106106
Execute(name, source)
@@ -132,8 +132,8 @@ func condaTestLogging(t *testing.T, context spec.G, it spec.S) {
132132
secondImage, logs, err := pack.WithNoColor().Build.
133133
WithPullPolicy("never").
134134
WithBuildpacks(
135-
settings.Buildpacks.PythonInstallers.Online,
136-
settings.Buildpacks.PythonPackagers.Online,
135+
settings.Buildpacks.PythonPackageManagersInstall.Online,
136+
settings.Buildpacks.PythonPackageManagersRun.Online,
137137
settings.Buildpacks.BuildPlan.Online,
138138
).
139139
Execute(name, source)
@@ -158,8 +158,8 @@ func condaTestLogging(t *testing.T, context spec.G, it spec.S) {
158158
image, logs, err := pack.WithNoColor().Build.
159159
WithPullPolicy("never").
160160
WithBuildpacks(
161-
settings.Buildpacks.PythonInstallers.Online,
162-
settings.Buildpacks.PythonPackagers.Online,
161+
settings.Buildpacks.PythonPackageManagersInstall.Online,
162+
settings.Buildpacks.PythonPackageManagersRun.Online,
163163
settings.Buildpacks.BuildPlan.Online,
164164
).
165165
Execute(name, source)

‎integration/packagers/conda_offline_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ func condaTestOffline(t *testing.T, context spec.G, it spec.S) {
6161
image, logs, err = pack.WithNoColor().Build.
6262
WithPullPolicy("never").
6363
WithBuildpacks(
64-
settings.Buildpacks.PythonInstallers.Offline,
65-
settings.Buildpacks.PythonPackagers.Offline,
64+
settings.Buildpacks.PythonPackageManagersInstall.Offline,
65+
settings.Buildpacks.PythonPackageManagersRun.Offline,
6666
settings.Buildpacks.BuildPlan.Online,
6767
).
6868
WithNetwork("none").

‎integration/packagers/init_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,23 @@ func TestIntegration(t *testing.T) {
6969
Execute(settings.Config.CPython)
7070
Expect(err).NotTo(HaveOccurred())
7171

72-
settings.Buildpacks.PythonInstallers.Online, err = buildpackStore.Get.
72+
settings.Buildpacks.PythonPackageManagersInstall.Online, err = buildpackStore.Get.
7373
WithVersion("0.1.0").
74-
Execute(settings.Config.PythonInstallers)
74+
Execute(settings.Config.PythonPackageManagersInstall)
7575
Expect(err).NotTo(HaveOccurred())
7676

77-
settings.Buildpacks.PythonInstallers.Offline, err = buildpackStore.Get.
77+
settings.Buildpacks.PythonPackageManagersInstall.Offline, err = buildpackStore.Get.
7878
WithVersion("0.1.0").
7979
WithOfflineDependencies().
80-
Execute(settings.Config.PythonInstallers)
80+
Execute(settings.Config.PythonPackageManagersInstall)
8181
Expect(err).NotTo(HaveOccurred())
8282

83-
settings.Buildpacks.PythonPackagers.Online, err = buildpackStore.Get.
83+
settings.Buildpacks.PythonPackageManagersRun.Online, err = buildpackStore.Get.
8484
WithVersion("1.2.3").
8585
Execute(root)
8686
Expect(err).NotTo(HaveOccurred())
8787

88-
settings.Buildpacks.PythonPackagers.Offline, err = buildpackStore.Get.
88+
settings.Buildpacks.PythonPackageManagersRun.Offline, err = buildpackStore.Get.
8989
WithVersion("1.2.3").
9090
WithOfflineDependencies().
9191
Execute(root)

‎integration/packagers/pip_default_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ func pipTestDefault(t *testing.T, context spec.G, it spec.S) {
6464
WithPullPolicy("never").
6565
WithBuildpacks(
6666
settings.Buildpacks.CPython.Online,
67-
settings.Buildpacks.PythonInstallers.Online,
68-
settings.Buildpacks.PythonPackagers.Online,
67+
settings.Buildpacks.PythonPackageManagersInstall.Online,
68+
settings.Buildpacks.PythonPackageManagersRun.Online,
6969
settings.Buildpacks.BuildPlan.Online,
7070
).
7171
Execute(name, source)
@@ -115,8 +115,8 @@ func pipTestDefault(t *testing.T, context spec.G, it spec.S) {
115115
WithPullPolicy("never").
116116
WithBuildpacks(
117117
settings.Buildpacks.CPython.Online,
118-
settings.Buildpacks.PythonInstallers.Online,
119-
settings.Buildpacks.PythonPackagers.Online,
118+
settings.Buildpacks.PythonPackageManagersInstall.Online,
119+
settings.Buildpacks.PythonPackageManagersRun.Online,
120120
settings.Buildpacks.BuildPlan.Online,
121121
).
122122
WithEnv(map[string]string{
@@ -168,8 +168,8 @@ func pipTestDefault(t *testing.T, context spec.G, it spec.S) {
168168
WithPullPolicy("never").
169169
WithBuildpacks(
170170
settings.Buildpacks.CPython.Online,
171-
settings.Buildpacks.PythonInstallers.Online,
172-
settings.Buildpacks.PythonPackagers.Online,
171+
settings.Buildpacks.PythonPackageManagersInstall.Online,
172+
settings.Buildpacks.PythonPackageManagersRun.Online,
173173
settings.Buildpacks.BuildPlan.Online,
174174
).
175175
WithEnv(map[string]string{

0 commit comments

Comments
 (0)