feat: Support multiple extras in requirements constraint advertisement

CHANGELOG.rst

@@ -5,6 +5,15 @@ Change Log
    This file loosely adheres to the structure of https://keepachangelog.com/,
    but in reStructuredText instead of Markdown.
 
+2023-08-15
+**********
+
+Changed
+=======
+
+- In setup.py, support advertising constraints on packages with multiple extras
+- Fail packaging if requirements are spelled differently in different places
+
 2023-08-11
 **********
 

python-template/{{cookiecutter.placeholder_repo_name}}/setup.py

@@ -36,17 +36,43 @@ def load_requirements(*requirements_paths):
     with -c in the requirements files.
     Returns a list of requirement strings.
     """
+    by_canonical_name = {}
+
+    def check_name_consistent(package):
+        """
+        Raise exception if package is spelled different ways.
+
+        This ensures that packages are spelled consistently so we can match
+        constraints to packages. It also ensures that if we require a package
+        with extras we don't constrain it without mentioning the extras (since
+        that too would interfere with matching constraints.)
+        """
+        canonical = package.lower().replace('_', '-').split('[')[0]
+        seen_spelling = by_canonical_name.get(canonical)
+        if seen_spelling is None:
+            by_canonical_name[canonical] = package
+        elif seen_spelling != package:
+            raise Exception(
+                f'Encountered both "{seen_spelling}" and "{package}" in requirements '
+                'and constraints files; please use just one or the other.'
+            )
+
     requirements = {}
     constraint_files = set()
 
     # groups "pkg<=x.y.z,..." into ("pkg", "<=x.y.z,...")
-    requirement_line_regex = re.compile(r"([a-zA-Z0-9-_.\[\]]+)([<>=][^#\s]+)?")
+    re_package_name_base_chars = r"a-zA-Z0-9\-_."  # chars allowed in base package name
+    requirement_line_regex = re.compile(
+        r"([%s]+(?:\[[%s,\s]+\])?)([<>=][^#\s]+)?"
+        % (re_package_name_base_chars, re_package_name_base_chars)
+    )
 
     def add_version_constraint_or_raise(current_line, current_requirements, add_if_not_present):
         regex_match = requirement_line_regex.match(current_line)
         if regex_match:
             package = regex_match.group(1)
             version_constraints = regex_match.group(2)
+            check_name_consistent(package)
             existing_version_constraints = current_requirements.get(package, None)
             # It's fine to add constraints to an unconstrained package,
             # but raise an error if there are already constraints in place.

scripts/update_setup_py.sh

@@ -50,8 +50,8 @@ fi
 echo -e "[ARCHBOM-1772](https://openedx.atlassian.net/browse/ARCHBOM-1772)
  Update setup.py to use constraint files when generating requirements files for packaging and distribution.
  PR generated automatically with Jenkins job cleanup-python-code. " > .git/cleanup-python-code-description
-echo -e "\nResult of running \`python setup.py bdist_wheel\` before applying fix (in .egg-info/requires.txt)\: \n" >> .git/cleanup-python-code-description
+echo -e "\nResult of running \`python setup.py bdist_wheel\` before applying fix (in .egg-info/requires.txt): \n" >> .git/cleanup-python-code-description
 cat ./update-setup-tmp/old_requires.txt >> .git/cleanup-python-code-description
-echo -e "\nResult of running \`python setup.py bdist_wheel\` after applying fix (in .egg-info/requires.txt)\: \n" >> .git/cleanup-python-code-description
+echo -e "\nResult of running \`python setup.py bdist_wheel\` after applying fix (in .egg-info/requires.txt): \n" >> .git/cleanup-python-code-description
 cat "$(pwd)/$wheel_dir/requires.txt" >> .git/cleanup-python-code-description
 rm -rf update-setup-tmp

scripts/update_setup_py_load_requirements.yaml

@@ -17,18 +17,43 @@ rules:
         Returns a list of requirement strings.
         """
         # UPDATED VIA SEMGREP - if you need to remove/modify this method remove this line and add a comment specifying why.
+        by_canonical_name = {}
+
+        def check_name_consistent(package):
+            """
+            Raise exception if package is spelled different ways.
+
+            This ensures that packages are spelled consistently so we can match
+            constraints to packages. It also ensures that if we require a package
+            with extras we don't constrain it without mentioning the extras (since
+            that too would interfere with matching constraints.)
+            """
+            canonical = package.lower().replace('_', '-').split('[')[0]
+            seen_spelling = by_canonical_name.get(canonical)
+            if seen_spelling is None:
+                by_canonical_name[canonical] = package
+            elif seen_spelling != package:
+                raise Exception(
+                    f'Encountered both "{seen_spelling}" and "{package}" in requirements '
+                    'and constraints files; please use just one or the other.'
+                )
 
         requirements = {}
         constraint_files = set()
 
         # groups "pkg<=x.y.z,..." into ("pkg", "<=x.y.z,...")
-        requirement_line_regex = re.compile(r"([a-zA-Z0-9-_.\[\]]+)([<>=][^#\s]+)?")
+        re_package_name_base_chars = r"a-zA-Z0-9\-_."  # chars allowed in base package name
+        requirement_line_regex = re.compile(
+            r"([%s]+(?:\[[%s,\s]+\])?)([<>=][^#\s]+)?"
+            % (re_package_name_base_chars, re_package_name_base_chars)
+        )
 
         def add_version_constraint_or_raise(current_line, current_requirements, add_if_not_present):
             regex_match = requirement_line_regex.match(current_line)
             if regex_match:
                 package = regex_match.group(1)
                 version_constraints = regex_match.group(2)
+                check_name_consistent(package)
                 existing_version_constraints = current_requirements.get(package, None)
                 # It's fine to add constraints to an unconstrained package,
                 # but raise an error if there are already constraints in place.