Skip to content
Merged
Show file tree
Hide file tree
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
29 changes: 0 additions & 29 deletions .github/workflows/upgrade-python-requirements.yml

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
> [!WARNING]
> Problem Builder is no longer being developed by OpenCraft.
> It will be supported with compatibility and security fixes
> till the Ulmo release, after which this repository will be
> stop receiving further updates and eventually be archived.
> Problem Builder is unmaintained.
> There will be no further updates, and eventually this repository will be archived.
> This may no longer work correctly on Open edX platform releases newer than Ulmo.
> See https://discuss.openedx.org/t/deprecation-removal-problem-builder-repository/13664 for more information.


## Problem Builder and Step Builder
Expand Down
72 changes: 6 additions & 66 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,71 +42,6 @@ def get_version(*file_paths):
raise RuntimeError('Unable to find version string.')


def load_requirements(*requirements_paths):
"""
Load all requirements from the specified requirements files.

Requirements will include any constraints from files specified
with -c in the requirements files.
Returns a list of requirement strings.
"""
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]+)?")

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)
existing_version_constraints = current_requirements.get(package, None)
# fine to add constraints to an unconstrained package,
# raise an error if there are already constraints in place
if existing_version_constraints and existing_version_constraints != version_constraints:
raise BaseException(
f'Multiple constraint definitions found for {package}:'
f' "{existing_version_constraints}" and "{version_constraints}".'
f'Combine constraints into one location with {package}'
f'{existing_version_constraints},{version_constraints}.'
)
if add_if_not_present or package in current_requirements:
current_requirements[package] = version_constraints

# read requirements from .in
# store the path to any constraint files that are pulled in
for path in requirements_paths:
with open(path) as reqs:
for line in reqs:
if is_requirement(line):
add_version_constraint_or_raise(line, requirements, True)
if line and line.startswith('-c') and not line.startswith('-c http'):
constraint_files.add(os.path.dirname(path) + '/' + line.split('#')[0].replace('-c', '').strip())

# process constraint files: add constraints to existing requirements
for constraint_file in constraint_files:
with open(constraint_file) as reader:
for line in reader:
if is_requirement(line):
add_version_constraint_or_raise(line, requirements, False)

# process back into list of pkg><=constraints strings
constrained_requirements = [f'{pkg}{version or ""}' for (pkg, version) in sorted(requirements.items())]
return constrained_requirements


def is_requirement(line):
"""
Return True if the requirement line is a package requirement.

Returns:
bool: True if the line is not blank, a comment,
a URL, or an included file
"""
return line and line.strip() and not line.startswith(("-r", "#", "-e", "git+", "-c"))


def package_data(pkg, roots):
"""Generic function to find package_data.

Expand Down Expand Up @@ -184,7 +119,12 @@ def package_data(pkg, roots):
exclude=["*tests"],
),
package_data=package_data("problem_builder", ["templates", "public", "translations"]),
install_requires=load_requirements('requirements/base.in'),
Comment thread
bradenmacdonald marked this conversation as resolved.
Resolved
install_requires=[
"xblock-utils",
"edx-opaque-keys",
"Django",
"setuptools<82",
],
python_requires=">=3.11",
keywords='Python edx',
entry_points={
Expand Down
Loading