Merge branch 'main' into patch-1

Author: cvanelteren

.github/workflows/label_check.yml

@@ -24,7 +24,7 @@ jobs:
             exit 1
           fi
 
-          RELEASE_LABELS=("release::enhancements" "release::bug_fixes" "release::ci_docs")
+          RELEASE_LABELS=("release::enhancements" "release::bug_fixes" "release::ci_docs" "release::maintenance")
           PR_LABELS=$(jq -r '.pull_request.labels[].name' "$GITHUB_EVENT_PATH")
           NB_RELEASE_LABELS=0
 

.github/workflows/linters.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - feat/*
   pull_request:
     branches:
       - main
+      - feat/*
   merge_group:
     types: [checks_requested]
 

.github/workflows/static_build.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - feat/*
   pull_request:
     branches:
       - main
+      - feat/*
     paths-ignore:
       - "docs/**"
       - "mamba/**"
@@ -75,7 +77,7 @@ jobs:
       # The build_locally.py script will test all Linux builds, which fails outside of linux-64
       - name: Build conda package (Linux emulated)
         if: ${{ matrix.platform == 'linux' && matrix.arch != '64' }}
-        uses: uraimo/run-on-arch-action@v2
+        uses: uraimo/run-on-arch-action@v3
         with:
           arch: ${{ matrix.arch }}
           distro: ubuntu_latest

.github/workflows/tests.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - feat/*
   pull_request:
     branches:
       - main
+      - feat/*
     paths-ignore:
       - "docs/**"
       - "**.md"

.github/workflows/unix_impl.yml

@@ -40,6 +40,7 @@ jobs:
             --preset mamba-unix-shared-${{ inputs.build_type }}  \
             -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
             -D CMAKE_C_COMPILER_LAUNCHER=sccache \
+            -D MAMBA_WARNING_AS_ERROR=ON \
             -D BUILD_LIBMAMBAPY=OFF \
             -D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF
           cmake --build build/ --parallel
@@ -107,7 +108,10 @@ jobs:
           python -m pip install --no-deps --no-build-isolation ./libmambapy
       - name: Run libmamba Python bindings tests
         run: |
-          python -m pytest libmambapy/tests/ ${{ runner.debug == 'true' && '-v' || '--exitfirst' }}
+          # Only rerun flaky tests on the `main` branch
+          python -m pytest libmambapy/tests/ \
+              ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} \
+              ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   mamba_integration_tests_unix:
     name: mamba integration tests
@@ -162,8 +166,10 @@ jobs:
         run: |
           export TEST_MAMBA_EXE=$(pwd)/build/micromamba/mamba
           unset CONDARC  # Interferes with tests
+          # Only rerun flaky tests on the `main` branch
           python -m pytest micromamba/tests/ \
-            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }}
+              ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} \
+              ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   verify_pkg_tests:
     name: mamba-content-trust tests

.github/workflows/windows_impl.yml

@@ -116,7 +116,10 @@ jobs:
           python -m pip install --no-deps --no-build-isolation ./libmambapy
       - name: Run libmamba Python bindings tests
         run: |
-          python -m pytest libmambapy/tests/ ${{ runner.debug == 'true' && '-v' || '--exitfirst' }}
+          # Only rerun flaky tests on the `main` branch
+          python -m pytest libmambapy/tests/ ^
+            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} ^
+            ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}
 
   mamba_integration_tests_win:
     name: mamba integration tests
@@ -149,5 +152,7 @@ jobs:
           $env:TEST_MAMBA_EXE = Join-Path -Path $pwd -ChildPath 'local\bin\mamba.exe'
           $env:MAMBA_TEST_SHELL_TYPE='powershell'
           Remove-Item -Path "env:CONDARC"
+          # Only rerun flaky tests on the `main` branch
           python -m pytest micromamba/tests/ `
-            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }}
+            ${{ runner.debug == 'true' && '-v --capture=tee-sys' || '--exitfirst' }} `
+            ${{ github.ref == 'refs/heads/main' && '--reruns 3' || '' }}

.markdownlint.yaml

@@ -0,0 +1,9 @@
+# Default state for all rules
+default: true
+
+# MD013/line-length - Line length
+MD013:
+  # Number of characters
+  line_length: 200
+
+no-duplicate-heading: false

.pre-commit-config.yaml

@@ -19,6 +19,11 @@ repos:
       - id: rst-backticks
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
+  - repo: https://github.com/DavidAnson/markdownlint-cli2
+    rev: v0.17.1
+    hooks:
+      - id: markdownlint-cli2
+        args: [--fix]
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.19.1
     hooks:

.readthedocs.yml

@@ -1,5 +1,9 @@
 version: 2
 
+sphinx:
+  # Path to Sphinx configuration file
+  configuration: docs/source/conf.py
+
 build:
   os: "ubuntu-22.04"
   tools: