Skip to content

Commit

Permalink
build: bump poetry2nix which includes a poetry version bump to 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Sep 9, 2023
1 parent cc7cf3f commit af2c232
Show file tree
Hide file tree
Showing 12 changed files with 104 additions and 311 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: sudo apt-get install -y -q build-essential graphviz libgeos-dev libkrb5-dev krb5-config freetds-dev

- name: install poetry
run: pip install 'poetry<1.4'
run: pip install 'poetry==1.6.1'

- name: check consistency with pyproject.toml
run: poetry lock --check
Expand All @@ -60,7 +60,7 @@ jobs:
diff --unified "$old" "$new"
- name: generate requirements-dev.txt
run: poetry export --extras all --with dev --with test --with docs --with quarto --without-hashes --no-ansi > requirements-dev.txt
run: poetry export --extras all --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt

- name: check requirements-dev.txt
run: git diff --exit-code requirements-dev.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
requirement_files: poetry.lock
custom_cache_key_element: ${{ matrix.backend.name }}-${{ steps.install_python.outputs.python-version }}

- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- uses: syphar/restore-pip-download-cache@v1
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ibis-backends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
python-version: "${{ matrix.python-version }}"

- name: install poetry
run: python -m pip install --upgrade pip 'poetry<1.4'
run: python -m pip install --upgrade pip 'poetry==1.6.1'

- uses: syphar/restore-pip-download-cache@v1
with:
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
custom_cache_key_element: ${{ steps.install_python.outputs.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry<1.4'
run: python -m pip install --upgrade pip 'poetry==1.6.1'

- uses: syphar/restore-virtualenv@v1
with:
Expand Down Expand Up @@ -523,7 +523,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry<1.4'
run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: install minimum versions
run: poetry add --lock --optional ${{ join(matrix.backend.deps, ' ') }}
Expand Down Expand Up @@ -608,7 +608,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry<1.4'
run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: remove conflicting deps
if: matrix.pandas.conflicts != null
Expand Down Expand Up @@ -654,7 +654,7 @@ jobs:
with:
python-version: "3.11"

- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: remove deps that are not compatible with sqlalchemy 2
run: poetry remove snowflake-sqlalchemy
Expand Down Expand Up @@ -789,7 +789,7 @@ jobs:
custom_cache_key_element: ${{ steps.install_python.outputs.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry<1.4'
run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: install ibis
run: poetry install --without dev --without docs --extras "${{ join(matrix.backend.extras, ' ') }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ibis-docs-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
requirement_files: poetry.lock
custom_cache_key_element: benchmarks-${{ steps.install_python.outputs.python-version }}

- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: install ibis
run: poetry install --without dev --without docs --all-extras
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ibis-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
requirement_files: poetry.lock
custom_cache_key_element: no-backends-${{ steps.install_python.outputs.python-version }}

- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- uses: syphar/restore-virtualenv@v1
with:
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
sudo apt-get update -y -q
sudo apt-get install -y -q build-essential libgeos-dev
- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- name: install ibis
# install duckdb and geospatial because of https://github.com/ibis-project/ibis/issues/4856
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
requirement_files: poetry.lock
custom_cache_key_element: doctests-${{ steps.install_python.outputs.python-version }}

- run: python -m pip install --upgrade pip 'poetry<1.4'
- run: python -m pip install --upgrade pip 'poetry==1.6.1'

- uses: syphar/restore-virtualenv@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: check poetry version
run: nix run '.#check-poetry-version' -- "1.3"
run: nix run '.#check-poetry-version' -- "1.6.1"

- name: setup cachix
uses: cachix/cachix-action@v12
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: python -m pip install --upgrade pip

- name: install poetry
run: python -m pip install 'poetry<1.4' poetry-dynamic-versioning
run: python -m pip install 'poetry==1.6.1' poetry-dynamic-versioning

- name: compute ibis version
id: get_version
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ clean:
lock:
#!/usr/bin/env bash
version="$(poetry --version)"
if ! grep -qP '\(version 1\.3\.\d+\)' <<< "${version}"; then
>&2 echo "poetry version must be 1.3.x, got ${version}"
if ! grep -qP '\(version 1\.6\.1\)' <<< "${version}"; then
>&2 echo "poetry version must be 1.6.1, got ${version}"
exit 1
fi
poetry lock --no-update
poetry export --extras all --with dev --with test --with docs --with quarto --without-hashes --no-ansi > requirements-dev.txt
poetry export --extras all --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt
# show all backends
@list-backends:
Expand Down
Loading

0 comments on commit af2c232

Please sign in to comment.