Merge branch 'main' into cross-rbase-v1

Author: mgorny

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
         id: version
         if: ${{ ! env.CI_SKIP }}
         run: |
-          echo "current version: "$(git tag --sort=committerdate | tail -1)
+          echo "recent version tags: "$(git tag --sort=committerdate | tail -4)
           NEXT=$(python autotick-bot/compute_next_version.py)
           echo "next version: ${NEXT}"
           echo "NEXT=${NEXT}" >> "$GITHUB_OUTPUT"

.github/workflows/tests-reusable.yml

@@ -39,6 +39,8 @@ jobs:
     defaults:
       run:
         shell: bash -leo pipefail {0}
+    env:
+      NUM_SPLITS: 2
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -103,19 +105,6 @@ jobs:
 
           python -m pip install -v --no-deps --no-build-isolation -e .
 
-      - name: start MongoDB
-        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0
-        if: ${{ ! env.CI_SKIP }}
-        with:
-          mongodb-version: "latest"
-
-      - name: test mongodb is OK
-        if: ${{ ! env.CI_SKIP }}
-        run: |
-          python -c "from pymongo import MongoClient; import os; print(MongoClient(os.environ['MONGODB_CONNECTION_STRING']))"
-        env:
-          MONGODB_CONNECTION_STRING: "mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000"
-
       - name: set up docker buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
         if: ${{ ! env.CI_SKIP }}
@@ -143,14 +132,13 @@ jobs:
         if: ${{ ! env.CI_SKIP }}
         run: |
           export TEST_BOT_TOKEN_VAL=unpassword
-          # note: we do not use pytest-xdist (-n auto) here for now because they interfere with hiding the
-          # MONGODB_CONNECTION_STRING sensitive environment variable
           if [[ -f .test_durations ]]; then
             cp .test_durations .test_durations.${{ matrix.group }}
           fi
           pytest \
             -v \
-            --splits 2 --group ${{ matrix.group }} \
+            -n 3 \
+            --splits ${NUM_SPLITS} --group ${{ matrix.group }} \
             --store-durations \
             --durations-path=.test_durations.${{ matrix.group }} \
             --splitting-algorithm least_duration \
@@ -162,9 +150,9 @@ jobs:
             --cov-report=xml \
             --durations=10 \
             --ignore=tests/model \
+            -m "not mongodb" \
             tests
         env:
-          MONGODB_CONNECTION_STRING: "mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000"
           RUN_URL: ""
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
 
@@ -184,9 +172,159 @@ jobs:
           path: .coverage
           include-hidden-files: true
 
+  tests-mongodb:
+    name: tests-mongodb
+    runs-on: "ubuntu-latest"
+    permissions:
+      actions: write  # for deleting cache entries
+      contents: read
+    strategy:
+      # continue running the tests even if one of the groups fails
+      fail-fast: false
+      matrix:
+        # if change the number of groups here, also change it next to --splits below
+        group: [1]
+    defaults:
+      run:
+        shell: bash -leo pipefail {0}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: "regro/cf-scripts"
+
+      - name: prep the lockfile
+        if:  ${{ !inputs.lockfile-is-artifact }}
+        run: |
+          mkdir input-lockfile
+          mv conda-lock.yml input-lockfile/${{ inputs.lockfile }}
+
+      - name: download lockfile if it is an artifact
+        if: ${{ inputs.lockfile-is-artifact }}
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        with:
+          name: ${{ inputs.lockfile }}
+          path: input-lockfile
+
+      - name: move lockfile to repo
+        run: |
+          mv input-lockfile/${{ inputs.lockfile }} conda-lock.yml
+          rm -rf input-lockfile
+
+      - uses: mamba-org/setup-micromamba@0dea6379afdaffa5d528b3d1dabc45da37f443fc # v2.0.4
+        with:
+          environment-file: conda-lock.yml
+          environment-name: cf-scripts
+          condarc-file: autotick-bot/condarc
+
+      - name: stop me if needed
+        run: |
+          python autotick-bot/stop_me_if_needed.py
+
+      - name: configure conda and install code
+        if: ${{ ! env.CI_SKIP }}
+        run: |
+          pip install --no-deps --no-build-isolation -e .
+
+      - name: Set up git
+        if: ${{ ! env.CI_SKIP }}
+        run: |
+          git config --global user.name regro-cf-autotick-bot
+          git config --global user.email [email protected]
+          git config --global pull.rebase false
+
+      - name: test versions
+        if: ${{ ! env.CI_SKIP }}
+        run: |
+          cd ..
+          python -c "import conda_forge_tick; assert conda_forge_tick.__version__ != '0.0.0'"
+          cd -
+
+          pip uninstall conda-forge-tick --yes
+          rm -rf dist/*
+          python -m build --sdist . --outdir dist
+          pip install --no-deps --no-build-isolation dist/*.tar.gz
+          cd ..
+          python -c "import conda_forge_tick; assert conda_forge_tick.__version__ != '0.0.0'"
+          cd -
+          pip uninstall conda-forge-tick --yes
+
+          python -m pip install -v --no-deps --no-build-isolation -e .
+
+      - name: start MongoDB
+        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0
+        if: ${{ ! env.CI_SKIP }}
+        with:
+          mongodb-version: "latest"
+
+      - name: test mongodb is OK
+        if: ${{ ! env.CI_SKIP }}
+        run: |
+          python -c "from pymongo import MongoClient; import os; print(MongoClient(os.environ['MONGODB_CONNECTION_STRING']))"
+        env:
+          MONGODB_CONNECTION_STRING: "mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000"
+
+      - name: restore test durations
+        uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf  # v4.2.2
+        if: ${{ ! env.CI_SKIP }}
+        with:
+          path: .test_durations
+          key: test-durations-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            test-durations-${{ github.ref }}-
+            test-durations-
+
+      - name: run pytest
+        if: ${{ ! env.CI_SKIP }}
+        run: |
+          export TEST_BOT_TOKEN_VAL=unpassword
+          # note: we do not use pytest-xdist (-n auto) here for now because they interfere with hiding the
+          # MONGODB_CONNECTION_STRING sensitive environment variable
+          if [[ -f .test_durations ]]; then
+            cp .test_durations .test_durations.${{ matrix.group }}
+          fi
+          pytest \
+            -v \
+            --splits 1 --group ${{ matrix.group }} \
+            --store-durations \
+            --durations-path=.test_durations.mongodb \
+            --splitting-algorithm least_duration \
+            --clean-durations \
+            --cov=conda_forge_tick \
+            --cov=tests \
+            --cov-config=.coveragerc \
+            --cov-report=term-missing \
+            --cov-report=xml \
+            --durations=10 \
+            --ignore=tests/model \
+            -m "mongodb" \
+            tests
+        env:
+          MONGODB_CONNECTION_STRING: "mongodb://127.0.0.1:27017/?directConnection=true&serverSelectionTimeoutMS=2000"
+          RUN_URL: ""
+          BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+
+      - name: upload test durations
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        if: ${{ ! env.CI_SKIP }}
+        with:
+          name: test-durations-mongodb
+          path: .test_durations.mongodb
+          include-hidden-files: true
+
+      - name: upload coverage
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        if: ${{ ! env.CI_SKIP }}
+        with:
+          name: coverage-mongodb
+          path: .coverage
+          include-hidden-files: true
+
   test-coverage-and-durations:
     name: test-coverage-and-durations
-    needs: tests
+    needs:
+      - tests
+      - tests-mongodb
     runs-on: "ubuntu-latest"
     defaults:
       run:
@@ -261,7 +399,8 @@ jobs:
       - name: combine test durations
         if: ${{ ! env.CI_SKIP }}
         run: |
-          jq '. + input' test-durations-*/.test_durations.* > .test_durations
+          # see https://stackoverflow.com/a/71416016/1745538
+          jq 'reduce inputs as $i (.; . + $i)' test-durations-*/.test_durations.* > .test_durations
 
       - name: upload test durations
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1

Dockerfile

@@ -30,7 +30,9 @@ RUN conda activate base && \
     pip install --no-deps --no-build-isolation -e . && \
     cd - && \
     conda deactivate && \
-    conda deactivate
+    conda deactivate && \
+    # remove .git dir once installed and version is set
+    rm -rf $AUTOTICK_BOT_DIR/.git
 
 # now make the conda user for running tasks and set the user
 RUN useradd --shell /bin/bash -c "" -m conda
@@ -40,6 +42,7 @@ ENV LOGNAME=conda
 ENV MAIL=/var/spool/mail/conda
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/conda/bin
 RUN chown conda:conda $HOME && \
+    chown -R conda:conda /opt/autotick-bot && \
     cp -R /etc/skel $HOME && \
     chown -R conda:conda $HOME/skel && \
     (ls -A1 $HOME/skel | xargs -I {} mv -n $HOME/skel/{} $HOME) && \

autotick-bot/compute_next_version.py

@@ -2,6 +2,8 @@
 import subprocess
 import sys
 
+from conda.models.version import VersionOrder
+
 # get the current date for tagging below
 now = datetime.datetime.utcnow()
 
@@ -18,15 +20,28 @@
 else:
     # we have a tag so bump
     curr_version = None
+    curr_version_line = None
     for line in res.stdout.splitlines():
         line = line.strip()
         if line:
-            curr_version = line
+            try:
+                _version = VersionOrder(line)
+            except Exception:
+                print(
+                    f"skipping tag that is not a version: {line}",
+                    file=sys.stderr,
+                    flush=True,
+                )
+                continue
+
+            if curr_version is None or _version > curr_version:
+                curr_version = _version
+                curr_version_line = line
     assert curr_version is not None
-    print("found current version: %s" % line, file=sys.stderr, flush=True)
+    print(f"found current version: {curr_version_line}", file=sys.stderr, flush=True)
 
     # figure out if we bump the major, minor or patch version
-    major_minor, patch = curr_version.rsplit(".", 1)
+    major_minor, patch = curr_version_line.rsplit(".", 1)
     now_major_minor = f"{now.year}.{now.month}"
     if major_minor == now_major_minor:
         new_version = f"{major_minor}.{int(patch) + 1}"