Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Small fixes to CI scripts #760

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

Merged
merged 15 commits into from
Nov 9, 2025
Merged

Small fixes to CI scripts #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4bf8667
Add optional tests
rhugonnet Nov 7, 2025
0fad889
Fix if statement
rhugonnet Nov 7, 2025
92c9547
Fix optional dependencies
rhugonnet Nov 7, 2025
4642bca
Remove version pin pytest
rhugonnet Nov 7, 2025
68fb9cc
Pin pytest again
rhugonnet Nov 7, 2025
312fc8e
Try like this
rhugonnet Nov 7, 2025
750630d
Reset cache
rhugonnet Nov 7, 2025
c0fa69e
Try like this
rhugonnet Nov 7, 2025
3f2b45d
Fix string check
rhugonnet Nov 7, 2025
04e12e7
Small fix
rhugonnet Nov 7, 2025
bd48ac5
Remove space
rhugonnet Nov 7, 2025
8111aa7
Import or skip tests with optional dependencies
rhugonnet Nov 7, 2025
9f1996f
Final skips
rhugonnet Nov 7, 2025
3ed0b13
Small fixes in CI scripts
rhugonnet Nov 9, 2025
81cd3b7
Merge remote-tracking branch 'upstream/main' into add_ci_optional
rhugonnet Nov 9, 2025
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 .github/scripts/generate_yml_env_fixed_py.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def environment_yml_nopy(fn_env: str, py_version: str, add_deps: list[str] = Non

# Optionally, add other dependencies
if add_deps is not None:
conda_dep_env_forced_py.extend(add_deps)
conda_dep_env_forced_py.extend(add_deps.split(","))

# Copy back to new yaml dict
yaml_out = yaml_env.copy()
Expand Down Expand Up @@ -51,4 +51,4 @@ def environment_yml_nopy(fn_env: str, py_version: str, add_deps: list[str] = Non
help="List of dependencies to add.",
)
args = parser.parse_args()
environment_yml_nopy(fn_env=args.fn_env, py_version=args.py_version, add_deps=args.add_deps.split(","))
environment_yml_nopy(fn_env=args.fn_env, py_version=args.py_version, add_deps=args.add_deps)
2 changes: 1 addition & 1 deletion .github/workflows/python-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
python .github/scripts/generate_yml_env_fixed_py.py --pyv ${{ matrix.python-version }} --add "gdal" "environment.yml"
mamba env update -n geoutils-dev -f environment-ci-py${{ matrix.python-version }}.yml

# If/else equivalent to install base environment, or base+optionnal
# If/else equivalent to install base environment, or base+optional
- name: Install project environment (base)
if: ${{ matrix.dep-level == 'base' }}
run: pip install -e .[test]
Expand Down
Loading