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.

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

feat: support a new package type pypi #2142

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a284526
feat: support a new package type "pip"
suzuki-shunsuke Jul 29, 2023
c9b9352
fix: add pre-commit as testdata
suzuki-shunsuke Jul 29, 2023
a35410b
fix: add PYTHONPATH
suzuki-shunsuke Jul 29, 2023
d2e8908
refactor: remove an unused method
suzuki-shunsuke Jul 29, 2023
2f64023
feat: support getting versions from pypi.org
suzuki-shunsuke Jul 30, 2023
c6accc6
refactor: merge vesionSelector
suzuki-shunsuke Jul 30, 2023
d66ad19
feat(generate-registry): support pypi.org
suzuki-shunsuke Jul 30, 2023
a1312fe
ci: add tests for pip
suzuki-shunsuke Jul 30, 2023
7a7b207
ci: add test cases to windows test
suzuki-shunsuke Jul 30, 2023
da9a753
feat: add a link
suzuki-shunsuke Jul 30, 2023
7e96c04
fix: fix for windows
suzuki-shunsuke Jul 30, 2023
4fe9d69
fix: rename pip to pypi
suzuki-shunsuke Jul 30, 2023
76333b6
Merge branch 'main' into feat/pip-package
suzuki-shunsuke Jul 30, 2023
1ef7acc
ci: fix test
suzuki-shunsuke Jul 30, 2023
2af9538
docs: update JSON Schema
suzuki-shunsuke Jul 30, 2023
8c7ccbb
fix: get the latest version
suzuki-shunsuke Jul 30, 2023
1101c4e
fix: output name
suzuki-shunsuke Jul 30, 2023
bb7906c
fix(update-checksum): ignore pypi packages
suzuki-shunsuke Jul 30, 2023
d2ce04a
test: add a test
suzuki-shunsuke Jul 30, 2023
d5fb58f
Merge branch 'main' into feat/pip-package
suzuki-shunsuke Jul 30, 2023
ec2c3cb
fix(pypi): pass a package version
suzuki-shunsuke Jul 30, 2023
b53cfdb
ci: fix testdata
suzuki-shunsuke Jul 30, 2023
44eabdb
fix: fix log field name
suzuki-shunsuke Jul 30, 2023
c6e727d
Merge branch 'main' into feat/pip-package
suzuki-shunsuke Jul 30, 2023
0b55c2c
refactor: use convertStringsToVersions
suzuki-shunsuke Jul 30, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'main' into feat/pip-package
  • Loading branch information
suzuki-shunsuke authored Jul 30, 2023
commit c6e727d8aaf857b3e246fb3383294d090df67ee5
1 change: 1 addition & 0 deletions pkg/controller/exec/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func (ctrl *Controller) Exec(ctx context.Context, logE *logrus.Entry, param *con
if findResult.Package == nil {
return ctrl.execCommandWithRetry(ctx, logE, findResult.ExePath, args, nil)
}

logE = logE.WithFields(logrus.Fields{
"package_name": findResult.Package.Package.Name,
"package_version": findResult.Package.Package.Version,
Expand Down
7 changes: 1 addition & 6 deletions pkg/controller/generate/cargo.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@ func (ctrl *Controller) getCargoVersion(ctx context.Context, logE *logrus.Entry,
return ""
}

versions := make([]*Version, len(versionStrings))
for i, v := range versionStrings {
versions[i] = &Version{
Version: v,
}
}
versions := convertStringsToVersions(versionStrings)

idx, err := ctrl.versionSelector.Find(versions, false)
if err != nil {
Expand Down
4 changes: 1 addition & 3 deletions pkg/util/error.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package util

import (
"errors"
)
import "errors"

var ErrHTTPStatusCodeIsGreaterEqualThan300 = errors.New("HTTP status code is greater equal than 300")
You are viewing a condensed version of this merge commit. You can view the full changes here.