remove collect_upstream_conda_tests and test_modified_upstream (#371

) * remove collect_upstream_conda_tests and test_modified_upstream * sync workflow with upstream * fix workflow * pre-commit
conda · Nov 11, 2023 · b864e27 · b864e27
1 parent 125b9b2
commit b864e27
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 1,741 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -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'"
 
@@ -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'))"
 
@@ -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
 

diff --git a/.github/workflows/upstream_tests.yml b/.github/workflows/upstream_tests.yml
diff --git a/dev/collect_upstream_conda_tests/collect_upstream_conda_tests.py b/dev/collect_upstream_conda_tests/collect_upstream_conda_tests.py
diff --git a/dev/collect_upstream_conda_tests/pyproject.toml b/dev/collect_upstream_conda_tests/pyproject.toml
diff --git a/dev/linux/bashrc.sh b/dev/linux/bashrc.sh
@@ -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

diff --git a/dev/linux/upstream_integration.sh b/dev/linux/upstream_integration.sh
@@ -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)"

diff --git a/dev/linux/upstream_unit.sh b/dev/linux/upstream_unit.sh
@@ -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
 

diff --git a/docs/dev/setup.md b/docs/dev/setup.md
@@ -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`

diff --git a/docs/dev/workflows.md b/docs/dev/workflows.md
@@ -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.