Skip to content

util/resolve: add support for PyPI requirements in API client #332

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

Merged
cuixq merged 3 commits into from
Feb 25, 2026
Merged

util/resolve: add support for PyPI requirements in API client #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dce2d0f
util/resolve: add support for PyPI requirements in API client
cuixq Feb 25, 2026
dbc9137
go mod tidy
cuixq Feb 25, 2026
34f5546
Merge branch 'main' into api
cuixq Feb 25, 2026
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
2 changes: 1 addition & 1 deletion examples/go/resolve/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace (
)

require (
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738
deps.dev/util/resolve v0.0.0-20240312000934-38ffc8dd1d92
google.golang.org/grpc v1.78.0
)
Expand Down
4 changes: 2 additions & 2 deletions examples/go/resolve/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7 h1:dleK4xoNCfxlfknQNPR1DmSdVErIAWlEzxtTImCqWXI=
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7/go.mod h1:k3RHZwAw7ijqoXmVDvcO7ikeTwTC4jtmhCDathV+IKE=
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738 h1:901QBvj0xb8eVAQMHXsAyw4gWrt1wLFJSw6D2vnbq4g=
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738/go.mod h1:+gN+ydvfcDk/mTxWon7Ze4X8gYN/HZxUdt54XWgWcRQ=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
Expand Down
27 changes: 27 additions & 0 deletions util/resolve/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,37 @@ func (a *APIClient) Requirements(ctx context.Context, vk VersionKey) ([]Requirem
return a.mavenRequirements(ctx, vk, resp.Maven)
case NPM:
return a.npmRequirements(vk, resp.Npm)
case PyPI:
return a.pypiRequirements(resp.Pypi)
}
return nil, errors.New("unsupported system")
}

func (a *APIClient) pypiRequirements(reqs *pb.Requirements_PyPI) ([]RequirementVersion, error) {
var result []RequirementVersion
for _, d := range reqs.GetDependencies() {
var t dep.Type
if d.Extras != "" {
t.AddAttr(dep.EnabledDependencies, d.Extras)
}
if d.EnvironmentMarker != "" {
t.AddAttr(dep.Environment, d.EnvironmentMarker)
}
result = append(result, RequirementVersion{
VersionKey: VersionKey{
PackageKey: PackageKey{
System: PyPI,
Name: d.ProjectName,
},
VersionType: Requirement,
Version: d.VersionSpecifier,
},
Type: t,
})
}
return result, nil
}

func (a *APIClient) MatchingVersions(ctx context.Context, vk VersionKey) ([]Version, error) {
if isNPMBundle(vk.Name) {
bv, ok := a.getBundledVersion(vk.Name)
Expand Down
64 changes: 64 additions & 0 deletions util/resolve/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,67 @@ func TestNPMDependencies(t *testing.T) {
}
}
}

func TestPyPIRequirements(t *testing.T) {
req := func(name, version, typ string) RequirementVersion {
dt, err := deptest.ParseString(typ)
if err != nil {
t.Fatal(err)
}
return RequirementVersion{
VersionKey: VersionKey{
PackageKey: PackageKey{
System: PyPI,
Name: name,
},
VersionType: Requirement,
Version: version,
},
Type: dt,
}
}

for _, c := range []struct {
in *pb.Requirements_PyPI
out []RequirementVersion
}{{
in: &pb.Requirements_PyPI{},
out: nil,
}, {
in: &pb.Requirements_PyPI{
Dependencies: []*pb.Requirements_PyPI_Dependency{{
ProjectName: "regular",
VersionSpecifier: "==1.0.0",
}, {
ProjectName: "with-extras",
VersionSpecifier: "==2.0.0",
Extras: "extra1,extra2",
}, {
ProjectName: "with-marker",
VersionSpecifier: "==3.0.0",
EnvironmentMarker: "python_version < '3'",
}, {
ProjectName: "with-both",
VersionSpecifier: "==4.0.0",
Extras: "extra3",
EnvironmentMarker: "os_name == 'nt'",
}},
},
out: []RequirementVersion{
req("regular", "==1.0.0", ""),
req("with-extras", "==2.0.0", "EnabledDependencies extra1,extra2"),
req("with-marker", "==3.0.0", "Environment \"python_version < '3'\""),
req("with-both", "==4.0.0", "EnabledDependencies extra3 Environment \"os_name == 'nt'\""),
},
}} {
client := APIClient{}
got, err := client.pypiRequirements(c.in)
if err != nil {
t.Errorf("pypiRequirements(%v): %v", c.in, err)
continue
}
if d := cmp.Diff(c.out, got); d != "" {
t.Errorf("pypiRequirements(%v):\n(- want, + got):\n%s", c.in, d)
}
}
}
2 changes: 1 addition & 1 deletion util/resolve/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace (
)

require (
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738
deps.dev/util/maven v0.0.0-20240322043601-ff53416fec6a
deps.dev/util/pypi v0.0.0-20250307021655-d811e36f9cad
deps.dev/util/semver v0.0.0-20241230231135-52b7655a522f
Expand Down
4 changes: 2 additions & 2 deletions util/resolve/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7 h1:dleK4xoNCfxlfknQNPR1DmSdVErIAWlEzxtTImCqWXI=
deps.dev/api/v3 v3.0.0-20240311054650-e1e6a3d70fb7/go.mod h1:k3RHZwAw7ijqoXmVDvcO7ikeTwTC4jtmhCDathV+IKE=
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738 h1:901QBvj0xb8eVAQMHXsAyw4gWrt1wLFJSw6D2vnbq4g=
deps.dev/api/v3 v3.0.0-20260225062937-bb3cf65ba738/go.mod h1:+gN+ydvfcDk/mTxWon7Ze4X8gYN/HZxUdt54XWgWcRQ=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
Expand Down
Loading