Skip to content

feat: allow brackets when parsing library names #154

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

Closed
rgraber wants to merge 1 commit into from
Closed

feat: allow brackets when parsing library names #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 scripts/update_setup_py.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ echo -e "rules:
constraint_files = set()

# groups \"my-package-name<=x.y.z,...\" into (\"my-package-name\", \"<=x.y.z,...\")
requirement_line_regex = re.compile(r\"([a-zA-Z0-9-_.]+)([<>=][^#\s]+)?\")
requirement_line_regex = re.compile(r\"([a-zA-Z0-9-_.\[\]]+)([<>=][^#\s]+)?\")
Copy link
Copy Markdown
Contributor

@timmc-edx timmc-edx Nov 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
requirement_line_regex = re.compile(r\"([a-zA-Z0-9-_.\[\]]+)([<>=][^#\s]+)?\")
requirement_line_regex = re.compile(r\"([a-zA-Z0-9\-_.\[\],]+)([<>=][^#\s]+)?\")

There can be more than one extra in the list, so we should have a comma as well. And probably want to escape this hyphen, even though it shouldn't cause trouble at the moment (since there's a range just before it).

Copy link
Copy Markdown
Contributor

@timmc-edx timmc-edx Nov 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theoretically, there could also be whitespace around that comma or probably even the brackets. I don't see any instances of that in our code, though. 🤔


def add_version_constraint_or_raise(current_line, current_requirements, add_if_not_present):
regex_match = requirement_line_regex.match(current_line)
Expand Down