Skip to content

Scrub multiple ways of describing index-url from requirements.txt #544

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

Merged
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
4 changes: 2 additions & 2 deletions src/python/supply/supply.go
Original file line number Diff line number Diff line change
Expand Up @@ -699,15 +699,15 @@ func (s *Supplier) RunPipVendored() error {
installArgs = append(installArgs, "--no-build-isolation")
}

// Remove lines from requirements.txt that begin with -i
// Remove lines from requirements.txt that begin with -i, --index-url and --extra-index-url
// because specifying index links here makes pip always want internet access,
// and pipenv generates requirements.txt with -i.
originalReqs, err := ioutil.ReadFile(requirementsPath)
if err != nil {
return fmt.Errorf("could not read requirements.txt: %v", err)
}

re := regexp.MustCompile(`(?m)^\s*-i.*$`)
re := regexp.MustCompile(`(?m)^\s*(-i|--index-url|--extra-index-url)\s+(.*)$`)
modifiedReqs := re.ReplaceAll(originalReqs, []byte{})
err = ioutil.WriteFile(requirementsPath, modifiedReqs, 0644)
if err != nil {
Expand Down