Update the repository to use single pyproject.toml and pixi

.github/workflows/docs.yml

@@ -5,36 +5,36 @@ on: [push, pull_request]
 jobs:
   build:
 
+    name: Test building docs
+
     runs-on: ubuntu-latest
+
+    env:
+      python_env: py313
+
     strategy:
-      matrix:
-        python-version: [3.12]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        sudo apt install redis
-
-        # These packages are installed in the base environment but may be older
-        # versions. Explicitly upgrade them because they often create
-        # installation problems if out of date.
-        python -m pip install --upgrade pip setuptools numpy
-
-        pushd ..
-        git clone https://github.com/bluesky/bluesky-queueserver.git
-        cd bluesky-queueserver
-        pip install .
-        popd
-
-        pip install .
-        pip install -r requirements-dev.txt
-        pip list
-    - name: Build Docs
-      run: |
-        make -C docs/ html
+      - uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: "7.x"
+
+      - uses: prefix-dev/setup-pixi@v0.10.0
+
+      - name: Install dev dependencies
+        run: |
+          set -vxeuo pipefail
+          pixi install --environment=${{ env.python_env }}
+          pixi list --environment=${{ env.python_env }}
+          pixi run --environment=${{ env.python_env }} pip list
+          pixi run --environment=${{ env.python_env }} conda list
+
+      - name: Run pre-commit
+        run: |
+          pixi run --environment=${{ env.python_env }} make -C docs/ html

.github/workflows/docs_publish.yml

@@ -1,4 +1,4 @@
-name: Publish Docs
+name: Documentation
 
 on:
   push:
@@ -8,57 +8,50 @@ on:
 jobs:
   build:
     if: github.repository_owner == 'bluesky'
+
+    name: Build and publish docs
+
     runs-on: ubuntu-latest
+
+    env:
+      python_env: py313
+
     strategy:
-      matrix:
-        python-version: [3.12]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 1000  # should be enough to reach the most recent tag
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - uses: shogo82148/actions-setup-redis@v1
-      with:
-        redis-version: "7.x"
-    - name: Install dependencies
-      run: |
-        sudo apt install redis
+      - uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: "7.x"
 
-        # Versioneer uses the most recent git tag to generate __version__, which appears
-        # in the published documentation.
-        git fetch --tags
+      - uses: prefix-dev/setup-pixi@v0.10.0
 
-        # These packages are installed in the base environment but may be older
-        # versions. Explicitly upgrade them because they often create
-        # installation problems if out of date.
-        python -m pip install --upgrade pip setuptools numpy
+      - name: Install dev dependencies
+        run: |
+          set -vxeuo pipefail
+          pixi install --environment=${{ env.python_env }}
+          pixi list --environment=${{ env.python_env }}
+          pixi run --environment=${{ env.python_env }} pip list
+          pixi run --environment=${{ env.python_env }} conda list
 
-        pushd ..
-        git clone https://github.com/bluesky/bluesky-queueserver.git
-        cd bluesky-queueserver
-        pip install .
-        popd
+      - name: Run pre-commit
+        run: |
+          pixi run --environment=${{ env.python_env }} make -C docs/ html
 
-        pip install .
-        pip install -r requirements-dev.txt
-        pip list
-    - name: Build Docs
-      run: |
-        make -C docs/ html
-    - name: Deploy documentation to blueskyproject.io
-      # We pin to the SHA, not the tag, for security reasons.
-      # https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-      uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501  # v3.7.3
-      with:
-        deploy_key: ${{ secrets.ACTIONS_DOCUMENTATION_DEPLOY_KEY }}
-        publish_branch: master
-        publish_dir: ./docs/build/html
-        external_repository: bluesky/bluesky.github.io
-        destination_dir: bluesky-httpserver
-        keep_files: true  # Keep old files.
-        force_orphan: false  # Keep git history.
+      - name: Deploy documentation to blueskyproject.io
+        # We pin to the SHA, not the tag, for security reasons.
+        # https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
+        uses: peaceiris/actions-gh-pages@bbdfb200618d235585ad98e965f4aafc39b4c501  # v3.7.3
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DOCUMENTATION_DEPLOY_KEY }}
+          publish_branch: master
+          publish_dir: ./docs/build/html
+          external_repository: bluesky/bluesky.github.io
+          destination_dir: bluesky-httpserver
+          keep_files: true  # Keep old files.
+          force_orphan: false  # Keep git history.

.github/workflows/pre-commit.yml

@@ -11,23 +11,36 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
 
     name: Check code style
+
     runs-on: ubuntu-latest
+
+    env:
+      python_env: py313
+
     strategy:
       fail-fast: false
+
     defaults:
       run:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
 
-      - uses: actions/setup-python@v4
+      - uses: prefix-dev/setup-pixi@v0.10.0
 
       - name: Install dev dependencies
         run: |
           set -vxeuo pipefail
-          pip install -r requirements-dev.txt
-          python -m pip list
+          set -vxeuo pipefail
+          pixi install --environment=${{ env.python_env }}
+          pixi list --environment=${{ env.python_env }}
+          pixi run --environment=${{ env.python_env }} pip list
+          pixi run --environment=${{ env.python_env }} conda list
 
       - name: Run pre-commit
-        run: pre-commit run --all-files
+        run: |
+          pixi run --environment=${{ env.python_env }} pre-commit run --all-files

.github/workflows/testing.yml

@@ -8,67 +8,40 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-        # pydantic-version: ["<2.0.0", ">=2.0.0"]
-        # exclude:
-        #   - python-version: "3.9"
-        #     pydantic-version: "<2.0.0"
-        #   - python-version: "3.11"
-        #     pydantic-version: "<2.0.0"
-        #   - python-version: "3.12"
-        #     pydantic-version: "<2.0.0"
-
+        python-env: ["py311", "py312", "py313", "py314"]
       fail-fast: false
 
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Fetch tags
-      run: git fetch --tags --prune --unshallow
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
+        # Need this to get version number from last tag
+        fetch-depth: 0
+
     - uses: shogo82148/actions-setup-redis@v1
       with:
         redis-version: "7.x"
+
+    - uses: prefix-dev/setup-pixi@v0.10.0
     - name: Install dependencies
       run: |
-        # sudo apt install redis
+        pixi install --environment=${{ matrix.python-env }}
+        pixi list --environment=${{ matrix.python-env }}
+        pixi run --environment=${{ matrix.python-env }} pip list
+        pixi run --environment=${{ matrix.python-env }} conda list
 
+    - name: Start LDAP
+      run: |
         # Start LDAP
         bash continuous_integration/scripts/start_LDAP.sh
 
-        # These packages are installed in the base environment but may be older
-        # versions. Explicitly upgrade them because they often create
-        # installation problems if out of date.
-        python -m pip install --upgrade pip setuptools numpy
-
-        pushd ..
-        git clone https://github.com/bluesky/bluesky-queueserver.git
-        cd bluesky-queueserver
-        pip install .
-        popd
-
-        pushd ..
-        git clone https://github.com/bluesky/bluesky-queueserver-api.git
-        cd bluesky-queueserver-api
-        pip install .
-        popd
-
-        pip install --upgrade pip
-        pip install .
-        pip install -r requirements-dev.txt
-        # pip install "pydantic${{ matrix.pydantic-version }}"
-        # pip install bluesky==1.11.0
-
-        pip list
     - name: Test with pytest
       env:
         PYTEST_ADDOPTS: "--durations=20"
       run: |
-        coverage run -m pytest -vv
-        coverage report -m
+        pixi run --environment=${{ matrix.python-env }} coverage run -m pytest -vv
+        pixi run --environment=${{ matrix.python-env }} coverage report -m
+
     - name: Dump LDAP diagnostics on failure
       if: failure()
       run: |

.gitignore

@@ -58,6 +58,8 @@ coverage.xml
 docs/build/
 docs/source/generated/
 
+**/_version.py
+
 # pytest
 .pytest_cache/
 
@@ -84,3 +86,8 @@ target/
 
 # Testing
 .docker-test-artifacts/
+
+# pixi environments
+.pixi/*
+!.pixi/config.toml
+pixi.lock