Skip to content

Commit ebfc7de

Browse files
committed
feat: Add flit-core support
Signed-off-by: Pascal Zimmermann <pascal.zimmermann@theiotstudio.com>
1 parent 7cd0702 commit ebfc7de

File tree

28 files changed

+82
-78
lines changed

28 files changed

+82
-78
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ To build this buildpack, run the following commands from the buildpack's directo
2424
1. Install buildpack-packager
2525

2626
```bash
27-
go install github.com/cloudfoundry/libbuildpack/packager/buildpack-packager
27+
go get github.com/cloudfoundry/libbuildpack
28+
cd ~/go/src/github.com/cloudfoundry/libbuildpack && GO111MODULE=on go mod download
29+
cd packager/buildpack-packager && GO111MODULE=on go install
2830
```
2931

3032
1. Build the buildpack

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
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-20260306121953-8ab9253c8181
8+
github.com/cloudfoundry/libbuildpack v0.0.0-20260306125332-dcaf55eb6f33
99
github.com/cloudfoundry/switchblade v0.9.4
1010
github.com/golang/mock v1.6.0
1111
github.com/kr/text v0.2.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
748748
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
749749
github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181 h1:di63teVid/uT+6TAqBSXFqxNM3sAbxk6hssYppZBvbw=
750750
github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181/go.mod h1:Qtj1XicpoDn88w2cvVCYtw1Whq+kK3bouin0xNZ9lIU=
751+
github.com/cloudfoundry/libbuildpack v0.0.0-20260306125332-dcaf55eb6f33 h1:O3uSzqYH1x5yK/awqNJiwcxohLHfPkXO4KOgVHgCg4o=
752+
github.com/cloudfoundry/libbuildpack v0.0.0-20260306125332-dcaf55eb6f33/go.mod h1:Qtj1XicpoDn88w2cvVCYtw1Whq+kK3bouin0xNZ9lIU=
751753
github.com/cloudfoundry/switchblade v0.9.4 h1:93O90a/DRRcZ4h50htDh4z7+FMliqy/lQH6IFgVa+mQ=
752754
github.com/cloudfoundry/switchblade v0.9.4/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo=
753755
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=

manifest.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,15 @@ dependencies:
209209
- cflinuxfs4
210210
source: https://files.pythonhosted.org/packages/86/ff/f75651350db3cf2ef767371307eb163f3cc1ac03e16fdf3ac347607f7edb/setuptools-80.10.1.tar.gz
211211
source_sha256: bf2e513eb8144c3298a3bd28ab1a5edb739131ec5c22e045ff93cd7f5319703a
212+
- name: flit-core
213+
version: 3.12.0
214+
uri: https://buildpacks.cloudfoundry.org/dependencies/flit_core/flit_core-3.12.0_linux_noarch_any-stack_e8745ea3.tgz
215+
sha256: e8745ea31b2af10b2056552a65181b52f8fcc645f1ac13a4f6440525fcc896d1
216+
cf_stacks:
217+
- cflinuxfs4
218+
- cflinuxfs3
219+
source: https://files.pythonhosted.org/packages/69/59/b6fc2188dfc7ea4f936cd12b49d707f66a1cb7a1d2c16172963534db741b/flit_core-3.12.0.tar.gz
220+
source_sha256: 18f63100d6f94385c6ed57a72073443e1a71a4acb4339491615d0f16d6ff01b2
212221
include_files:
213222
- CHANGELOG
214223
- CONTRIBUTING.md

src/python/supply/supply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ func (s *Supplier) RunPipVendored() error {
743743
// dependencies - wheel and setuptools. These are packaged by the dependency
744744
// pipeline within the "pip" dependency.
745745
func (s *Supplier) InstallCommonBuildDependencies() error {
746-
var commonDeps = []string{"wheel", "setuptools"}
746+
var commonDeps = []string{"wheel", "setuptools", "flit-core"}
747747
tempPath := filepath.Join("/tmp", "common_build_deps")
748748
if err := s.Installer.InstallOnlyVersion("pip", tempPath); err != nil {
749749
return err

src/python/supply/supply_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,11 @@ MarkupSafe==2.0.1
633633

634634
Describe("InstallCommonBuildDependencies", func() {
635635
Context("successful installation", func() {
636-
It("runs command to install wheel and setuptools", func() {
636+
It("runs command to install wheel, setuptools and flit-core", func() {
637637
mockInstaller.EXPECT().InstallOnlyVersion("pip", "/tmp/common_build_deps")
638638
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "wheel", "--no-index", "--upgrade-strategy=only-if-needed", "--find-links=/tmp/common_build_deps")
639639
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "setuptools", "--no-index", "--upgrade-strategy=only-if-needed", "--find-links=/tmp/common_build_deps")
640+
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "python", "-m", "pip", "install", "flit-core", "--no-index", "--upgrade-strategy=only-if-needed", "--find-links=/tmp/common_build_deps")
640641

641642
Expect(supplier.InstallCommonBuildDependencies()).To(Succeed())
642643
})

vendor/github.com/cloudfoundry/libbuildpack/bratshelper/data.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/libbuildpack/bratshelper/language.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/libbuildpack/bratshelper/modify.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/libbuildpack/bratshelper/utils.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)