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

ENH rattler #37

Merged
merged 42 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2ca9916
WIP first pass at more refactors for rattler
beckermr Jun 1, 2024
2506f4a
Merge branch 'main' into rattler-maybe
beckermr Jun 1, 2024
407d737
REF move virtual package tests
beckermr Jun 2, 2024
af9c124
REF refactor tests to use rattler, add rattler solver
beckermr Jun 2, 2024
79f122f
STY blacken
beckermr Jun 2, 2024
3cd65b4
BUG need module
beckermr Jun 2, 2024
2594a7b
BUG need module
beckermr Jun 2, 2024
c6c3897
BUG need module
beckermr Jun 2, 2024
45f26f0
TST do not timeout
beckermr Jun 2, 2024
50bf950
REF use solver timeout if we have it
beckermr Jun 2, 2024
d8fab29
BUG rattler timeouts not working
beckermr Jun 2, 2024
a8796cf
FIXME ignore timeout for now
beckermr Jun 2, 2024
11ca9de
REF use context manager for env
beckermr Jun 2, 2024
7161b15
Merge branch 'main' into rattler-maybe
beckermr Jun 2, 2024
7b1ec3b
ENH add constraints and remove hack on times
beckermr Jun 3, 2024
cfe5d69
Merge branch 'main' into rattler-maybe
beckermr Jun 3, 2024
cb5838e
BUG try and see what pins are in the local env
beckermr Jun 3, 2024
34bd427
remove debug code
beckermr Jun 3, 2024
cfce17f
TST do not retry things we expect to fail
beckermr Jun 3, 2024
cf15a3c
Merge branch 'main' into rattler-maybe
beckermr Jun 3, 2024
34ed77a
STY blacken
beckermr Jun 3, 2024
54c8639
TST test solvers separately
beckermr Jun 3, 2024
d583a06
TST fix test parametrization
beckermr Jun 3, 2024
c918eaf
try a longer cache time for tests
beckermr Jun 3, 2024
6a1bfac
Merge branch 'main' into rattler-maybe
beckermr Jun 4, 2024
0eb724b
Merge branch 'main' into rattler-maybe
beckermr Jun 5, 2024
c7e0a02
REF move to timeout timer and always cache
beckermr Jun 5, 2024
05043e9
BUG wrong keyword name
beckermr Jun 5, 2024
a4f918f
BUG one week
beckermr Jun 5, 2024
5977a46
ENH better solver error output
beckermr Jun 5, 2024
8d6a97e
PROD remove requirement not needed
beckermr Jun 5, 2024
d7b061b
BUG fixed issue with cache in mamba
beckermr Jun 5, 2024
ed9fd2f
TST fix tests for global caching
beckermr Jun 5, 2024
5547535
REF cache subdir data only for mamba
beckermr Jun 6, 2024
7c81bfb
TST fail fast
beckermr Jun 6, 2024
a7ed1d0
Update conda_forge_feedstock_check_solvable/rattler_solver.py
beckermr Jun 6, 2024
defd925
BUG fix bugs in vpkg repodata
beckermr Jun 6, 2024
3ae02b9
Merge branch 'rattler-maybe' of https://github.com/regro/conda-forge-…
beckermr Jun 6, 2024
9b2de72
BUG do not use msys2 on windows
beckermr Jun 6, 2024
56ae20b
TST move mamba tests to another workflow
beckermr Jun 6, 2024
abf3587
BUG only use set_installed with constraints
beckermr Jun 6, 2024
24b4f7e
BUG only install one thing
beckermr Jun 6, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
shell: bash -l {0}
run: |
mamba install --yes --file=requirements.txt
mamba install --yes pytest flake8 flaky pip python-build setuptools_scm>=7 setuptools>=45 toml
mamba install --yes pytest flaky pip python-build setuptools_scm>=7 setuptools>=45 toml
pip install -e .

- name: test versions
Expand All @@ -63,7 +63,7 @@ jobs:

python -m pip install -v --no-deps --no-build-isolation -e .

- name: test
- name: test w/ rattler
shell: bash -l {0}
run: |
pytest -vvs tests
pytest -vv --durations=0 --solver=rattler tests
69 changes: 69 additions & 0 deletions .github/workflows/tests_mamba.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: tests-mamba

on:
push:
branches:
- main
pull_request: null

env:
PY_COLORS: "1"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
tests-mamba:
name: tests-mamba
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
with:
fetch-depth: 0

- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v2
with:
channels: conda-forge,defaults
channel-priority: strict
show-channel-urls: true
miniforge-version: latest
miniforge-variant: Mambaforge
python-version: 3.11
use-mamba: true

- name: configure conda and install code
shell: bash -l {0}
run: |
mamba install --yes --file=requirements.txt
mamba install --yes pytest flaky pip python-build setuptools_scm>=7 setuptools>=45 toml
pip install -e .

- name: test versions
shell: bash -el {0}
run: |
pip uninstall conda-forge-feedstock-check-solvable --yes
[[ $(python setup.py --version) != "0.0.0" ]] || exit 1

rm -rf dist/*
python setup.py sdist
pip install --no-deps --no-build-isolation dist/*.tar.gz
pushd ..
python -c "import conda_forge_feedstock_check_solvable; assert conda_forge_feedstock_check_solvable.__version__ != '0.0.0'"
popd
pip uninstall conda-forge-feedstock-check-solvable --yes

rm -rf dist/*
python -m build --sdist . --outdir dist
pip install --no-deps --no-build-isolation dist/*.tar.gz
pushd ..
python -c "import conda_forge_feedstock_check_solvable; assert conda_forge_feedstock_check_solvable.__version__ != '0.0.0'"
popd
pip uninstall conda-forge-feedstock-check-solvable --yes

python -m pip install -v --no-deps --no-build-isolation -e .

- name: test w/ mamba
shell: bash -l {0}
run: |
pytest -vv --durations=0 --solver=mamba tests
Loading
Loading