Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into Add-support-for-fid…
Browse files Browse the repository at this point in the history
…s-filter-with-use_arrow=True
  • Loading branch information
theroggy committed Dec 15, 2023
2 parents d700a98 + e820f90 commit e9bf6d6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- uses: pre-commit/[email protected]
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
include:
# environment with lower versions of optional dependencies
- python: "3.10"
extra: |
extra: >-
pandas=1.5
geopandas=0.12
# minimal environment without optional dependencies
Expand All @@ -46,13 +46,13 @@ jobs:
uses: actions/checkout@v4

- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ci/${{ matrix.env }}
extra-specs: |
create-args: >-
python=${{ matrix.python }}
${{ matrix.extra }}
cache-env: true
cache-environment: true

- name: Set environment variables (Windows)
if: runner.os == 'Windows'
Expand Down

0 comments on commit e9bf6d6

Please sign in to comment.