Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions build.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
package pythoninstallers

import (
"slices"

"github.com/paketo-buildpacks/packit/v2"
"github.com/paketo-buildpacks/packit/v2/scribe"

Expand Down Expand Up @@ -36,9 +38,15 @@ func Build(

orderedInstallers := []string{pip.Pip, pipenv.Pipenv, poetry.PoetryDependency, miniconda.Conda, uv.Uv}

doneInstallers := []string{}

for _, installer := range orderedInstallers {
for _, entry := range context.Plan.Entries {
if slices.Contains(doneInstallers, entry.Name) {
continue
}
if entry.Name == installer {
doneInstallers = append(doneInstallers, entry.Name)
logger.Title("Handling %s", entry.Name)
parameters, ok := buildParameters[entry.Name]

Expand Down
8 changes: 4 additions & 4 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ api = "0.8"
id = "miniconda3"
name = "Miniconda.sh"
os = "linux"
sha256 = "b40682cedf1e1755c02555f8d3d98aadb4607a68da7caf72a9bbe1fb9ae0b904"
sha256 = "2d94390e8858c72f6a28080954fd640ae4449d08d7b9d4ff8c94ad39beaf5f46"
source = "https://github.com/conda/conda/archive/refs/tags/25.3.1.tar.gz"
stacks = ["*"]
uri = "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.1.1-2-Linux-x86_64.sh"
uri = "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.3.1-1-Linux-x86_64.sh"
version = "25.3.1"

[[metadata.dependencies]]
Expand All @@ -31,10 +31,10 @@ api = "0.8"
id = "miniconda3"
name = "Miniconda.sh"
os = "linux"
sha256 = "5afee04df06c923462341cfc87727100a67fa854550d0d7a2e6295005168e6b7"
sha256 = "435f9b5640716dd770e9abe404c54db7d3493cb61a814c5de1fe345ea017d4a6"
source = "https://github.com/conda/conda/archive/refs/tags/25.3.1.tar.gz"
stacks = ["*"]
uri = "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.1.1-2-Linux-aarch64.sh"
uri = "https://repo.anaconda.com/miniconda/Miniconda3-py39_25.3.1-1-Linux-aarch64.sh"
version = "25.3.1"

[[metadata.dependencies]]
Expand Down
4 changes: 2 additions & 2 deletions integration/installers/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ func TestIntegration(t *testing.T) {

// miniconda
suite("Miniconda Default", minicondaTestDefault)
suite("Miniconda Logging", minicondaTestLogging)
suite("Miniconda LayerReuse", minicondaTestReusingLayerRebuild)
suite("Miniconda LayerReuse", minicondaTestLayerReuse)
suite("Miniconda TestOffline", minicondaTestOffline)
suite("Miniconda Version", minicondaTestVersions, spec.Parallel())

// pip
suite("Pip Default", pipTestDefault, spec.Parallel())
Expand Down
22 changes: 22 additions & 0 deletions integration/installers/miniconda_default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,28 @@ func minicondaTestDefault(t *testing.T, context spec.G, it spec.S) {
Execute(name, source)
Expect(err).ToNot(HaveOccurred(), logs.String)

Expect(logs).To(ContainLines(
MatchRegexp(fmt.Sprintf(`%s \d+\.\d+\.\d+`, buildpackInfo.Buildpack.Name)),
" Resolving Conda version",
" Candidate version sources (in priority order):",
" <unknown> -> \"\"",
))
Expect(logs).To(ContainLines(
MatchRegexp(` Selected Miniconda.sh version \(using <unknown>\): \d+\.\d+\.\d+`),
))
Expect(logs).To(ContainLines(
" Executing build process",
MatchRegexp(` Installing Miniconda \d+\.\d+\.\d+`),
MatchRegexp(` Completed in \d+(\.?\d+)*`),
))
Expect(logs).To(ContainLines(
" Configuring build environment",
` CONDA_PLUGINS_AUTO_ACCEPT_TOS -> "$CONDA_PLUGINS_AUTO_ACCEPT_TOS:true"`,
"",
" Configuring launch environment",
` CONDA_PLUGINS_AUTO_ACCEPT_TOS -> "$CONDA_PLUGINS_AUTO_ACCEPT_TOS:true"`,
))

container, err = docker.Container.Run.
WithCommand("conda info").
WithPublish("8080").
Expand Down
110 changes: 0 additions & 110 deletions integration/installers/miniconda_logging_test.go

This file was deleted.

Loading
Loading