Merge branch 'main' into 23.11.x

.authors.yml

@@ -2,17 +2,17 @@
   email: [email protected]
   aliases:
   - jaimergp
-  num_commits: 112
+  num_commits: 118
   first_commit: 2022-01-31 17:24:37
   github: jaimergp
 - name: Jannis Leidel
   email: [email protected]
-  num_commits: 35
+  num_commits: 38
   first_commit: 2022-02-17 14:48:48
   github: jezdez
 - name: pre-commit-ci[bot]
   email: 66853113+pre-commit-ci[bot]@users.noreply.github.com
-  num_commits: 31
+  num_commits: 32
   first_commit: 2022-11-22 08:39:31
   github: pre-commit-ci[bot]
 - name: Christopher Ostrouchov
@@ -52,3 +52,7 @@
   email: [email protected]
   num_commits: 1
   first_commit: 2023-04-18 12:42:06
+- name: Travis Hathaway
+  email: [email protected]
+  num_commits: 2
+  first_commit: 2023-11-10 15:58:32

.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