From eefdcd22b9d23d7814f26a7f95299fda853ed9b6 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Mon, 3 Nov 2025 16:45:42 -0500 Subject: [PATCH] Upgrade PPT version --- .copier-answers.yml | 2 +- .github/workflows/asv-main.yml | 6 ++---- .github/workflows/asv-nightly.yml | 6 ++---- .github/workflows/asv-pr.yml | 6 ++---- .github/workflows/pre-commit-ci.yml | 7 ++++--- .github/workflows/smoke-test.yml | 7 ++++--- .github/workflows/testing-and-coverage.yml | 7 ++++--- pyproject.toml | 3 +-- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 50f9c94b..78ca83f5 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v2.1.0 +_commit: v2.1.1 _src_path: gh:lincc-frameworks/python-project-template author_email: brantd@uw.edu author_name: LINCC Frameworks diff --git a/.github/workflows/asv-main.yml b/.github/workflows/asv-main.yml index 0f34aa1f..34b3ced7 100644 --- a/.github/workflows/asv-main.yml +++ b/.github/workflows/asv-main.yml @@ -9,7 +9,7 @@ on: env: PYTHON_VERSION: "3.11" - ASV_VERSION: "0.6.4" + ASV_VERSION: "0.6.5" WORKING_DIR: ${{github.workspace}}/benchmarks concurrency: @@ -34,9 +34,7 @@ jobs: with: fetch-depth: 0 - name: Install dependencies - run: | - pip install asv==${{env.ASV_VERSION}} - pip install virtualenv==20.30 # Temporary fix to airspeed-velocity/asv#1484 + run: pip install asv[virtualenv]==${{env.ASV_VERSION}} - name: Configure git run: | git config user.name "github-actions[bot]" diff --git a/.github/workflows/asv-nightly.yml b/.github/workflows/asv-nightly.yml index 27fa8c74..d0dbf4ce 100644 --- a/.github/workflows/asv-nightly.yml +++ b/.github/workflows/asv-nightly.yml @@ -10,7 +10,7 @@ on: env: PYTHON_VERSION: "3.11" - ASV_VERSION: "0.6.4" + ASV_VERSION: "0.6.5" WORKING_DIR: ${{github.workspace}}/benchmarks NIGHTLY_HASH_FILE: nightly-hash @@ -30,9 +30,7 @@ jobs: with: fetch-depth: 0 - name: Install dependencies - run: | - pip install asv==${{env.ASV_VERSION}} - pip install virtualenv==20.30 # Temporary fix to airspeed-velocity/asv#1484 + run: pip install asv[virtualenv]==${{env.ASV_VERSION}} - name: Configure git run: | git config user.name "github-actions[bot]" diff --git a/.github/workflows/asv-pr.yml b/.github/workflows/asv-pr.yml index 10d759ba..e52157fd 100644 --- a/.github/workflows/asv-pr.yml +++ b/.github/workflows/asv-pr.yml @@ -16,7 +16,7 @@ concurrency: env: PYTHON_VERSION: "3.11" - ASV_VERSION: "0.6.4" + ASV_VERSION: "0.6.5" WORKING_DIR: ${{github.workspace}}/benchmarks ARTIFACTS_DIR: ${{github.workspace}}/artifacts @@ -39,9 +39,7 @@ jobs: run: | echo "Workflow Run ID: ${{github.run_id}}" - name: Install dependencies - run: | - pip install asv==${{env.ASV_VERSION}} lf-asv-formatter - pip install virtualenv==20.30 # Temporary fix to airspeed-velocity/asv#1484 + run: pip install asv[virtualenv]==${{env.ASV_VERSION}} lf-asv-formatter - name: Make artifacts directory run: mkdir -p ${{env.ARTIFACTS_DIR}} - name: Save pull request number diff --git a/.github/workflows/pre-commit-ci.yml b/.github/workflows/pre-commit-ci.yml index 6bb1cb54..f2c42f50 100644 --- a/.github/workflows/pre-commit-ci.yml +++ b/.github/workflows/pre-commit-ci.yml @@ -21,12 +21,13 @@ jobs: uses: actions/setup-python@v6 with: python-version: '3.11' + - name: Install uv + uses: astral-sh/setup-uv@v7 - name: Install dependencies run: | sudo apt-get update - python -m pip install --upgrade pip - pip install .[dev] - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + uv pip install --system .[dev] + if [ -f requirements.txt ]; then uv pip install --system -r requirements.txt; fi - uses: pre-commit/action@v3.0.1 with: extra_args: --all-files --verbose diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index e36aa4eb..7e2fe02d 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -28,12 +28,13 @@ jobs: uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + - name: Install uv + uses: astral-sh/setup-uv@v7 - name: Install dependencies run: | sudo apt-get update - python -m pip install --upgrade pip - pip install -e .[dev] - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + uv pip install --system -e .[dev] + if [ -f requirements.txt ]; then uv pip install --system -r requirements.txt; fi - name: List dependencies run: | pip list diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index d829f2b0..19f95028 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -24,12 +24,13 @@ jobs: uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + - name: Install uv + uses: astral-sh/setup-uv@v7 - name: Install dependencies run: | sudo apt-get update - python -m pip install --upgrade pip - pip install -e .[dev] - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + uv pip install --system -e .[dev] + if [ -f requirements.txt ]; then uv pip install --system -r requirements.txt; fi - name: Run unit tests with pytest run: | python -m pytest --cov=nested_pandas --cov-report=xml diff --git a/pyproject.toml b/pyproject.toml index f308ddab..0945fb4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,8 +36,7 @@ dependencies = [ # On a mac, install optional dependencies with `pip install '.[dev]'` (include the single quotes) [project.optional-dependencies] dev = [ - "asv==0.6.5", # Used to compute performance benchmarks - "virtualenv==20.30", # Temporary fix to airspeed-velocity/asv#1484 + "asv[virtualenv]==0.6.5", # Used to compute performance benchmarks "jupyter", # Clears output from Jupyter notebooks "mypy", # Used for static type checking of files "pre-commit", # Used to run checks before finalizing a git commit