Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating version for pip for latest #129

Merged
merged 2 commits into from
May 3, 2021
Merged

Updating version for pip for latest #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d55dd94
Add pip 21.1.1, remove pip 21.0 in buildpack.toml
paketo-bot Apr 30, 2021
d38444a
Update test to dynamically pick version from buildpack.toml
arjun024 May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ api = "0.4"
include-files = ["bin/run", "bin/build", "bin/detect", "buildpack.toml"]
pre-package = "./scripts/build.sh"

[[metadata.dependencies]]
id = "pip"
sha256 = "51d2bf2634710bacaf62f7b4d3e85533d0ed5e03ffc25bd257fc96b499075d7e"
source = "https://files.pythonhosted.org/packages/9e/24/bc928987f35dd0167f21b13a1777c21b9c5917c9894cff93f1c1a6cb8f3b/pip-21.0.tar.gz"
source_sha256 = "b330cf6467afd5d15f4c1c56f5c95e56a2bfb941c869bed4c1aa517bcb16de25"
stacks = ["io.buildpacks.stacks.bionic", "org.cloudfoundry.stacks.cflinuxfs3"]
uri = "https://buildpacks.cloudfoundry.org/dependencies/pip/pip_21.0_linux_noarch_any-stack_51d2bf26.tgz"
version = "21.0"

[[metadata.dependencies]]
id = "pip"
sha256 = "120355ab3197f76c8811ce40537a5446ba107eaccd8efe18369e03698eb595f0"
Expand All @@ -26,6 +17,15 @@ api = "0.4"
uri = "https://buildpacks.cloudfoundry.org/dependencies/pip/pip_21.0.1_linux_noarch_any-stack_120355ab.tgz"
version = "21.0.1"

[[metadata.dependencies]]
id = "pip"
sha256 = "2f2f85ccff0d42208bec57844221d0a1d55c74d4d0638ab709155cf6b2e45b74"
source = "https://files.pythonhosted.org/packages/94/b0/e10bdc8809c81796c80aa3644a8e3dc16594fb1bd68f5996929f26cad980/pip-21.1.1.tar.gz"
source_sha256 = "51ad01ddcd8de923533b01a870e7b987c2eb4d83b50b89e1bf102723ff9fed8b"
stacks = ["io.buildpacks.stacks.bionic", "org.cloudfoundry.stacks.cflinuxfs3"]
uri = "https://buildpacks.cloudfoundry.org/dependencies/pip/pip_21.1.1_linux_noarch_any-stack_2f2f85cc.tgz"
version = "21.1.1"

[[stacks]]
id = "io.buildpacks.stacks.bionic"

Expand Down
7 changes: 1 addition & 6 deletions integration/layer_reuse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,7 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
settings.Buildpacks.Pip.Online,
settings.Buildpacks.BuildPlan.Online,
).
WithEnv(map[string]string{"BP_PIP_VERSION": "21.0.0"}).
// Note: Hard-coded pip version will cause this test to fail once pip 21.0 is
// dropped from the buildpack. Hardcoded here to prevent buildpack from selecting
// latest patch of 21.0 since dependency version has no patch in buildpack.toml.
// Replace WithEnv() above with the one below once pip 21.0 is dropped.
// WithEnv(map[string]string{"BP_PIP_VERSION": buildpackInfo.Metadata.Dependencies[1].Version}).
WithEnv(map[string]string{"BP_PIP_VERSION": buildpackInfo.Metadata.Dependencies[0].Version}).
Execute(name, filepath.Join("testdata", "default_app"))
Expect(err).ToNot(HaveOccurred(), logs.String)

Expand Down