Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/asv-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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]"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/asv-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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]"
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/asv-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pre-commit-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/testing-and-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down