From a4b46be0a379eceb43832cbc0c5b456f72b45218 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 22:55:42 +0000 Subject: [PATCH 1/5] Initial plan From 890fe126d898a677a73895ef68d77ff9905c5171 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 22:57:20 +0000 Subject: [PATCH 2/5] Migrate CI workflows from conda to uv package manager Co-authored-by: ColmTalbot <25602909+ColmTalbot@users.noreply.github.com> --- .github/workflows/pages.yml | 29 +++++++++-------------- .github/workflows/publish-to-pypi.yml | 6 ++++- .github/workflows/python-package.yml | 33 +++++++++++++-------------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index a0f84dfb..0b57e1c0 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -25,29 +25,22 @@ jobs: with: fetch-depth: 0 - - name: Setup Python - uses: actions/setup-python@v5 + - name: Install uv + uses: astral-sh/setup-uv@v4 with: - python-version: "3.11" + enable-cache: true - - name: Setup conda - uses: conda-incubator/setup-miniconda@v3 + - name: Setup Python + uses: actions/setup-python@v5 with: python-version: "3.11" - channels: conda-forge - auto-update-conda: true - mamba-version: "*" - conda-remove-defaults: "true" - name: Install dependencies run: | - eval "$(mamba shell hook --shell bash)" - mamba activate test - mamba install pip setuptools - mamba install --file requirements.txt - mamba install --file pages_requirements.txt - mamba install --file test_requirements.txt - python -m pip install . + uv pip install --system -r requirements.txt + uv pip install --system -r pages_requirements.txt + uv pip install --system -r test_requirements.txt + uv pip install --system . pre-commit install - name: Build documentation @@ -55,8 +48,8 @@ jobs: export BILBY_ALLOW_PARAMETERS_AS_STATE=FALSE cp examples/*.ipynb docs/examples cd docs - make SPHINXBUILD="mamba run -n test python -m sphinx" clean - make SPHINXBUILD="mamba run -n test python -m sphinx" html + make SPHINXBUILD="python -m sphinx" clean + make SPHINXBUILD="python -m sphinx" html - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 60df2ee6..ce2e2b14 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -14,12 +14,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + enable-cache: true - uses: actions/setup-python@v5 with: python-version: "3.11" - name: build release distributions run: | - python -m pip install build setuptools_scm + uv pip install --system build setuptools_scm python -m build --sdist --wheel --outdir dist/ . - name: upload wheel and tarball uses: actions/upload-artifact@v4 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 49682750..414b30f9 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -22,15 +22,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + enable-cache: true - name: Set up Python 3.12 uses: actions/setup-python@v5 with: python-version: "3.12" - name: Install gwpopulation - run: python -m pip install . + run: uv pip install --system . - name: Run pre-commits run: | - python -m pip install pre-commit jupyter nbconvert + uv pip install --system pre-commit jupyter nbconvert pre-commit install pre-commit run --all-files jupyter nbconvert --clear-output --inplace examples/*.ipynb @@ -46,33 +50,28 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + enable-cache: true - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Setup conda - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - channels: conda-forge,defaults - auto-update-conda: true - mamba-version: "*" - name: Install dependencies run: | - mamba install -n test pip setuptools - mamba install -n test --file requirements.txt - mamba install -n test --file test_requirements.txt - # conda run -n test pre-commit install + uv pip install --system -r requirements.txt + uv pip install --system -r test_requirements.txt - name: Install gwpopulation run: | - conda run -n test python -m pip install . + uv pip install --system . - name: List installed run: | - conda list -n test + uv pip list - name: Test with pytest run: | export BILBY_ALLOW_PARAMETERS_AS_STATE=FALSE - conda run -n test pytest --cov gwpopulation -ra --color yes --cov-report=xml --junitxml=pytest.xml + pytest --cov gwpopulation -ra --color yes --cov-report=xml --junitxml=pytest.xml - name: Publish coverage to Codecov uses: codecov/codecov-action@v4 with: @@ -80,7 +79,7 @@ jobs: files: coverage.xml flags: python${{ matrix.python-version }} - name: Coverage report - run: conda run -n test python -m coverage report --show-missing + run: python -m coverage report --show-missing - name: Upload test results if: always() uses: actions/upload-artifact@v4 From 7f3106921556820e304b0d2226b4254aca13f8cd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 23:03:45 +0000 Subject: [PATCH 3/5] Remove uv cache configuration since project doesn't use uv.lock Co-authored-by: ColmTalbot <25602909+ColmTalbot@users.noreply.github.com> --- .github/workflows/pages.yml | 2 -- .github/workflows/publish-to-pypi.yml | 2 -- .github/workflows/python-package.yml | 4 ---- 3 files changed, 8 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 0b57e1c0..07bd1ed0 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -27,8 +27,6 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v4 - with: - enable-cache: true - name: Setup Python uses: actions/setup-python@v5 diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index ce2e2b14..f210ef30 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -16,8 +16,6 @@ jobs: - uses: actions/checkout@v4 - name: Install uv uses: astral-sh/setup-uv@v4 - with: - enable-cache: true - uses: actions/setup-python@v5 with: python-version: "3.11" diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 414b30f9..36275bb1 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -24,8 +24,6 @@ jobs: - uses: actions/checkout@v4 - name: Install uv uses: astral-sh/setup-uv@v4 - with: - enable-cache: true - name: Set up Python 3.12 uses: actions/setup-python@v5 with: @@ -52,8 +50,6 @@ jobs: - uses: actions/checkout@v4 - name: Install uv uses: astral-sh/setup-uv@v4 - with: - enable-cache: true - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: From da92fbde3e265d96c547d1be5c692f566a97368d Mon Sep 17 00:00:00 2001 From: Colm Talbot Date: Sun, 15 Feb 2026 18:21:02 -0500 Subject: [PATCH 4/5] install pandoc in pages job --- .github/workflows/pages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 07bd1ed0..8d8b26b8 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -28,6 +28,8 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v4 + - name: Install Pandoc + uses: pandoc/actions/setup@v1 - name: Setup Python uses: actions/setup-python@v5 with: From 3c1fe64f1fb919c3dbfdd7d53ea057b608ac245a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Feb 2026 23:23:32 +0000 Subject: [PATCH 5/5] Fix indentation for pandoc installation step in pages workflow Co-authored-by: ColmTalbot <25602909+ColmTalbot@users.noreply.github.com> --- .github/workflows/pages.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 8d8b26b8..510545d3 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -28,8 +28,9 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v4 - - name: Install Pandoc - uses: pandoc/actions/setup@v1 + - name: Install Pandoc + uses: pandoc/actions/setup@v1 + - name: Setup Python uses: actions/setup-python@v5 with: