Skip to content
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.

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

Fixing recent CI failures since 23.3.0 release #187

Merged
merged 10 commits into from
Apr 21, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
python=${{ matrix.python-version }}
conda update openssl ca-certificates certifi
conda info
python -c "from importlib_metadata import version; print('libmambapy', version('libmambapy'))"
python -c "from importlib.metadata import version; print('libmambapy', version('libmambapy'))"

- name: Install conda-libmamba-solver
shell: bash -el {0}
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
if errorlevel 1 exit 1
call .\dev-init.bat
if errorlevel 1 exit 1
python -c "from importlib_metadata import version; print('libmambapy', version('libmambapy'))"
python -c "from importlib.metadata import version; print('libmambapy', version('libmambapy'))"
if errorlevel 1 exit 1
conda info -a
if errorlevel 1 exit 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upstream_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
:: Install conda-libmamba-solver
python -m pip install --no-deps -vv "%GITHUB_WORKSPACE%\conda-libmamba-solver"
if errorlevel 1 exit 1
python -c "from importlib_metadata import version; print('libmambapy', version('libmambapy'))"
python -c "from importlib.metadata import version; print('libmambapy', version('libmambapy'))"
if errorlevel 1 exit 1
:: override pytest settings
copy "%GITHUB_WORKSPACE%\conda-libmamba-solver\pyproject.toml" .\pyproject.toml
Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:
# original setup
./dev/macos/setup.sh
# /original setup
python -c "from importlib_metadata import version; print('libmambapy', version('libmambapy'))"
python -c "from importlib.metadata import version; print('libmambapy', version('libmambapy'))"
python -m pip install ../conda-libmamba-solver -vv --no-deps
conda info -a
# override pytest settings
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ repos:
- id: insert-license
files: \.py$
args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol]
exclude: ^tests/channel_testing_utils\.py # extend global exclude
exclude: ^(tests/channel_testing_utils\.py|mamba_utils\.py) # extend global exclude
5 changes: 1 addition & 4 deletions conda_libmamba_solver/mamba_utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (C) 2019 QuantStack and the Mamba contributors.
# Copyright (C) 2022 Anaconda, Inc
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jaimergp and @jezdez is it appropriate to add this line since I checked the git blame history and @jaimergp did make modifications after the QuantStack/Mamba work. I also excluded this file since it was causing precommit to fail.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess it's ok :)

# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause

Expand Down Expand Up @@ -77,10 +78,6 @@ def init_api_context(use_mamba_experimental: bool = False):
api_ctx.dry_run = context.dry_run
if context.json:
api.cancel_json_output()
context.always_yes = True
context.quiet = True
if use_mamba_experimental:
context.json = False

api_ctx.verbosity = context.verbosity
api_ctx.set_verbosity(context.verbosity)
Expand Down
5 changes: 2 additions & 3 deletions dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ pip
# run-time
boltons>=23.0.0
conda>=23.3.1
importlib-metadata
libmamba>=1.4.1
libmambapy>=1.4.1
libmamba>=1.4.1,!=1.4.2
libmambapy>=1.4.1,!=1.4.2
# be explicit about sqlite because sometimes it's removed from the env :shrug:
sqlite
19 changes: 19 additions & 0 deletions news/ci-failure-187
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* Do not set `quiet` manually when `context.json` is true. (#187)

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* Skip tests on libmamba 1.4.2 temporarily to workaround some test failures. Tracked by #186. (#187)
2 changes: 2 additions & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
conda-forge::pytest-xprocess
# needed for many conda tests
flask