Skip to content

Commit 0645046

Browse files
committed
feat: Add flit-core support
Signed-off-by: Pascal Zimmermann <pascal.zimmermann@theiotstudio.com> # Conflicts: # manifest.yml # Conflicts: # go.mod # go.sum
1 parent c911845 commit 0645046

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

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

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
})

0 commit comments

Comments
 (0)