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.

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

Jump to bottom

remove collect_upstream_conda_tests and test_modified_upstream #371

Merged
merged 4 commits into from
Nov 11, 2023
Merged

remove collect_upstream_conda_tests and test_modified_upstream #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11ef899
remove collect_upstream_conda_tests and test_modified_upstream
jaimergp Nov 10, 2023
a73de0c
sync workflow with upstream
jaimergp Nov 10, 2023
2201a90
fix workflow
jaimergp Nov 10, 2023
262df0b
pre-commit
jaimergp Nov 10, 2023
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: 0 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ jobs:
--file /opt/conda-libmamba-solver-src/dev/requirements.txt \
--file /opt/conda-libmamba-solver-src/tests/requirements.txt &&
sudo /opt/conda/bin/python -m pip install /opt/conda-libmamba-solver-src --no-deps -vvv &&
sudo /opt/conda/bin/python -m pip install /opt/conda-libmamba-solver-src/dev/collect_upstream_conda_tests/ -vvv &&
source /opt/conda-src/dev/linux/bashrc.sh &&
/opt/conda/bin/python -m pytest /opt/conda-libmamba-solver-src -vv -m 'not slow'"

Expand Down Expand Up @@ -167,7 +166,6 @@ jobs:
--file ../conda-libmamba-solver/tests/requirements.txt \
python=${{ matrix.python-version }}
conda update openssl ca-certificates certifi
python -m pip install ../conda-libmamba-solver/dev/collect_upstream_conda_tests -vv
conda info
python -c "from importlib.metadata import version; print('libmambapy', version('libmambapy'))"

Expand Down Expand Up @@ -263,8 +261,6 @@ jobs:
run: |
call .\dev-init.bat
if errorlevel 1 exit 1
python -m pip install -vv "%GITHUB_WORKSPACE%\conda-libmamba-solver\dev\collect_upstream_conda_tests"
if errorlevel 1 exit 1
python -m pip install --no-deps -vv "%GITHUB_WORKSPACE%\conda-libmamba-solver"
if errorlevel 1 exit 1

Expand Down
214 changes: 29 additions & 185 deletions .github/workflows/upstream_tests.yml
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 0 additions & 124 deletions dev/collect_upstream_conda_tests/collect_upstream_conda_tests.py
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions dev/collect_upstream_conda_tests/pyproject.toml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev/linux/bashrc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ if [ -d "/opt/mamba-src" ]; then
fi

cd /opt/conda-libmamba-solver-src
sudo /opt/conda/bin/python -m pip install ./dev/collect_upstream_conda_tests/ --no-deps
sudo /opt/conda/bin/python -m pip install -e . --no-deps

cd /opt/conda-src
Expand Down
1 change: 0 additions & 1 deletion dev/linux/upstream_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ sudo /opt/conda/bin/conda install --quiet -y --solver=classic --repodata-fn repo
--file "${CONDA_SRC}/tests/requirements.txt" \
--file "${CONDA_SRC}/tests/requirements-s3.txt" \
--file "${CONDA_LIBMAMBA_SOLVER_SRC}/dev/requirements.txt"
sudo /opt/conda/bin/python -m pip install "$CONDA_LIBMAMBA_SOLVER_SRC/dev/collect_upstream_conda_tests/"
sudo /opt/conda/bin/python -m pip install "$CONDA_LIBMAMBA_SOLVER_SRC" --no-deps -vvv
# /CONDA LIBMAMBA SOLVER CHANGES
eval "$(sudo /opt/conda/bin/python -m conda init --dev bash)"
Expand Down
1 change: 0 additions & 1 deletion dev/linux/upstream_unit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ sudo /opt/conda/bin/conda install --quiet -y --solver=classic --repodata-fn repo
--file "${CONDA_SRC}/tests/requirements.txt" \
--file "${CONDA_SRC}/tests/requirements-s3.txt" \
--file "${CONDA_LIBMAMBA_SOLVER_SRC}/dev/requirements.txt"
sudo /opt/conda/bin/python -m pip install "$CONDA_LIBMAMBA_SOLVER_SRC/dev/collect_upstream_conda_tests/"
sudo /opt/conda/bin/python -m pip install "$CONDA_LIBMAMBA_SOLVER_SRC" --no-deps -vvv
# /CONDA LIBMAMBA SOLVER CHANGES

Expand Down
7 changes: 0 additions & 7 deletions docs/dev/setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ $ cd $REPO_LOCATION
$ python -m pip install --no-deps -e .
```

5. Install the test collection plugins (only for upstream tests in `conda/conda`):

```bash
$ cd $REPO_LOCATION
$ python -m pip install dev/collect_upstream_conda_tests/
```

For testing out the `libmamba` solve you can set it several ways:
- environment variable `CONDA_SOLVER=libmamba`
- pass a flag `--solver=libmamba`
Expand Down
3 changes: 0 additions & 3 deletions docs/dev/workflows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,3 @@ From the properly mounted `conda/conda` Docker container (see ["Development envi
$ cd /opt/conda-src
$ CONDA_SOLVER=libmamba pytest
```

Note we [deselect some upstream tests in our `pyproject.toml`](../../dev/collect_upstream_conda_tests/collect_upstream_conda_tests.py) for a number of reasons.
For this to work we need to ensure that `pytest` loads that plugin by installing it in the same environment.
Loading
Loading