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
23 changes: 23 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:

env:
CI: True
PYTHONPATH: ${{ github.workspace }}

jobs:
build-linux:
Expand Down Expand Up @@ -56,6 +57,17 @@ jobs:
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Set up Python 3.9 - meshroom_compute test
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install dependencies (Python 3.9) - meshroom_compute test
run: |
python3.9 -m pip install --upgrade pip
python3.9 -m pip install -r requirements.txt --timeout 45
- name: Run imports - meshroom_compute test
run: |
python3.9 bin/meshroom_compute -h
build-windows:
runs-on: windows-latest
Expand Down Expand Up @@ -83,3 +95,14 @@ jobs:
- name: Test with pytest
run: |
pytest tests/
- name: Set up Python 3.9 - meshroom_compute test
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install dependencies (Python 3.9) - meshroom_compute test
run: |
python3 -m pip install --upgrade pip
python3 -m pip install -r requirements.txt --timeout 45
- name: Run imports - meshroom_compute test
run: |
python3 bin/meshroom_compute -h
23 changes: 11 additions & 12 deletions meshroom/core/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,18 @@ def resolveRezSubrequires(self) -> list[str]:
# in the current environment (if they are resolved in it)
for package in subrequires:
packageTuple = self.REZ_DELIMITER_PATTERN.split(package, maxsplit=1)
match len(packageTuple):
case 1:
# Only the package name in the subrequires.
# Search for a corresponding version in the parent environment.
packageName = packageTuple[0]
parentResolvedVersion = resolvedVersions.get(packageName)
if parentResolvedVersion:
packages.append(f"{packageName}=={parentResolvedVersion}")
else:
packages.append(package)
case 2:
# The subrequires ask for a specific version
if len(packageTuple) == 1:
# Only the package name in the subrequires.
# Search for a corresponding version in the parent environment.
packageName = packageTuple[0]
parentResolvedVersion = resolvedVersions.get(packageName)
if parentResolvedVersion:
packages.append(f"{packageName}=={parentResolvedVersion}")
else:
packages.append(package)
elif len(packageTuple) == 2:
# The subrequires ask for a specific version
packages.append(package)

def extractPackageName(packageString: str) -> str:
return self.REZ_DELIMITER_PATTERN.split(packageString, maxsplit=1)[0]
Expand Down
Loading