Merge branch 'main' into connecting-3.28.x

conda · Jan 5, 2024 · 435b7e2 · 435b7e2
2 parents c386c6c + a323ce5
commit 435b7e2
Show file tree

Hide file tree

Showing 61 changed files with 819 additions and 964 deletions.
diff --git a/.github/ISSUE_TEMPLATE/2_documentation.yml b/.github/ISSUE_TEMPLATE/2_documentation.yml
@@ -0,0 +1,37 @@
+---
+name: Documentation
+description: Create a documentation related issue.
+labels:
+  - type::documentation
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!NOTE]
+        > Documentation requests that are incomplete or missing information may be closed as inactionable.
+
+        Since there are already a lot of open issues, please also take a moment to search existing ones to see if your bug has already been reported. If you find something related, please upvote that issue and provide additional details as necessary.
+
+        💐 Thank you for helping to make conda better. We would be unable to improve conda without our community!
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Checklist
+      description: Please confirm and check all of the following options.
+      options:
+        - label: I added a descriptive title
+          required: true
+        - label: I searched open reports and couldn't find a duplicate
+          required: true
+  - type: textarea
+    id: what
+    attributes:
+      label: What happened?
+      description: Mention here any typos, broken links, or missing, incomplete, or outdated information, etc. that you have noticed in the conda docs or CLI help.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Include any additional information (or screenshots) that you think would be valuable.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
 
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         id: stale
         with:
           # Only issues with these labels are checked whether they are stale

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -92,7 +92,6 @@ jobs:
       CONDA_VERSION: ${{ contains('canary,release', matrix.conda-version) && 'conda' || format('conda={0}', matrix.conda-version) }}
       REPLAY_NAME: Linux-${{ matrix.conda-version }}-Py${{ matrix.python-version }}
       REPLAY_DIR: ${{ github.workspace }}/pytest-replay
-      ALLURE_DIR: ${{ github.workspace }}/allure-results
       PYTEST_MARKER: ${{ matrix.test-type == 'serial' && 'serial' || 'not serial' }}
       PYTEST_NUMPROCESSES: ${{ matrix.test-type == 'serial' && 0 || 'auto' }}
 
@@ -145,25 +144,13 @@ jobs:
             --cov-report xml \
             --replay-record-dir="${{ env.REPLAY_DIR }}" \
             --replay-base-name="${{ env.REPLAY_NAME }}" \
-            --alluredir="${{ env.ALLURE_DIR }}" \
             -m "${{ env.PYTEST_MARKER }}" \
             ./tests
 
       - uses: codecov/codecov-action@v3
         with:
           flags: ${{ matrix.test-type }},${{ matrix.python-version }},linux-64
 
-      - name: Tar Allure Results
-        if: '!cancelled()'
-        run: tar -zcf "${{ env.ALLURE_DIR }}.tar.gz" "${{ env.ALLURE_DIR }}"
-
-      - name: Upload Allure Results
-        if: '!cancelled()'
-        uses: actions/upload-artifact@v3
-        with:
-          name: allure-Linux-${{ matrix.conda-version }}-Py${{ matrix.python-version }}-${{ matrix.test-type }}
-          path: allure-results.tar.gz
-
       - name: Upload Pytest Replay
         if: '!cancelled()'
         uses: actions/upload-artifact@v3
@@ -196,7 +183,6 @@ jobs:
       CONDA_CHANNEL_LABEL: ${{ matrix.conda-version == 'canary' && 'conda-canary/label/dev' || 'defaults' }}
       REPLAY_NAME: Win-${{ matrix.conda-version }}-Py${{ matrix.python-version }}
       REPLAY_DIR: ${{ github.workspace }}\pytest-replay
-      ALLURE_DIR: ${{ github.workspace }}\allure-results
       PYTEST_MARKER: ${{ matrix.test-type == 'serial' && 'serial' || 'not serial and not slow' }}
       PYTEST_NUMPROCESSES: ${{ matrix.test-type == 'serial' && 0 || 'auto' }}
 
@@ -232,10 +218,6 @@ jobs:
             --file .\tests\requirements.txt ^
             --file .\tests\requirements-windows.txt ^
             ${{ env.CONDA_CHANNEL_LABEL }}::conda || exit 1
-          :: TEMPORARY
-          if "${{ matrix.python-version }}" == "3.8" CALL conda install "https://anaconda.org/conda-forge/menuinst/2.0.0/download/win-64/menuinst-2.0.0-py38hd3f51b4_1.conda" || exit 1
-          if "${{ matrix.python-version }}" == "3.11" CALL conda install "https://anaconda.org/conda-forge/menuinst/2.0.0/download/win-64/menuinst-2.0.0-py311h12c1d0e_1.conda" || exit 1
-          :: /TEMPORARY
           CALL pip install -e . --no-deps || exit 1
 
       - name: Show info
@@ -256,28 +238,13 @@ jobs:
             --cov-report xml `
             --replay-record-dir="${{ env.REPLAY_DIR }}" `
             --replay-base-name="${{ env.REPLAY_NAME }}" `
-            --alluredir="${{ env.ALLURE_DIR }}" `
             -m "${{ env.PYTEST_MARKER }}" `
             .\tests
 
       - uses: codecov/codecov-action@v3
         with:
           flags: ${{ matrix.test-type }},${{ matrix.python-version }},win-64
 
-      - name: Tar Allure Results
-        if: '!cancelled()'
-        run: tar -zcf "${{ env.ALLURE_DIR }}.tar.gz" "${{ env.ALLURE_DIR }}"
-        # windows-2019/powershell ships with GNU tar 1.28 which struggles with Windows paths
-        # window-2019/cmd ships with bsdtar 3.5.2 which doesn't have this problem
-        shell: cmd
-
-      - name: Upload Allure Results
-        if: '!cancelled()'
-        uses: actions/upload-artifact@v3
-        with:
-          name: allure-Win-${{ matrix.conda-version }}-Py${{ matrix.python-version }}-${{ matrix.test-type  }}
-          path: allure-results.tar.gz
-
       - name: Upload Pytest Replay
         if: '!cancelled()'
         uses: actions/upload-artifact@v3
@@ -313,7 +280,6 @@ jobs:
       CONDA_CHANNEL_LABEL: ${{ matrix.conda-version == 'canary' && 'conda-canary/label/dev' || 'defaults' }}
       REPLAY_NAME: macOS-${{ matrix.conda-version }}-Py${{ matrix.python-version }}
       REPLAY_DIR: ${{ github.workspace }}/pytest-replay
-      ALLURE_DIR: ${{ github.workspace }}/allure-results
       PYTEST_MARKER: ${{ matrix.test-type == 'serial' && 'serial' || 'not serial' }}
       PYTEST_NUMPROCESSES: ${{ matrix.test-type == 'serial' && 0 || 'auto' }}
 
@@ -367,25 +333,13 @@ jobs:
             --cov-report xml \
             --replay-record-dir="${{ env.REPLAY_DIR }}" \
             --replay-base-name="${{ env.REPLAY_NAME }}" \
-            --alluredir="${{ env.ALLURE_DIR }}" \
             -m "${{ env.PYTEST_MARKER }}" \
             ./tests
 
       - uses: codecov/codecov-action@v3
         with:
           flags: ${{ matrix.test-type }},${{ matrix.python-version }},osx-64
 
-      - name: Tar Allure Results
-        if: '!cancelled()'
-        run: tar -zcf "${{ env.ALLURE_DIR }}.tar.gz" "${{ env.ALLURE_DIR }}"
-
-      - name: Upload Allure Results
-        if: '!cancelled()'
-        uses: actions/upload-artifact@v3
-        with:
-          name: allure-macOS-${{ matrix.conda-version }}-Py${{ matrix.python-version }}-${{ matrix.test-type }}
-          path: allure-results.tar.gz
-
       - name: Upload Pytest Replay
         if: '!cancelled()'
         uses: actions/upload-artifact@v3

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -54,7 +54,7 @@ repos:
       # auto format Python codes within docstrings
       - id: blacken-docs
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.1.9
     hooks:
       # lint & attempt to correct failures (e.g. pyupgrade)
       - id: ruff