Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prepare python release 0.6.1 #795

Merged
merged 1 commit into from
Sep 6, 2022
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: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
os:
- ubuntu-latest
- macos-11
- macOS-10.15
- windows-latest
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -57,7 +56,6 @@ jobs:
os:
- ubuntu-latest
- macos-11
- macOS-10.15
- windows-latest
runs-on: ${{ matrix.os }}
steps:
Expand Down
104 changes: 52 additions & 52 deletions .github/workflows/python_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release to PyPI

on:
push:
tags: [ 'python-v*' ]
tags: ["python-v*"]

defaults:
run:
Expand Down Expand Up @@ -30,12 +30,11 @@ jobs:
fail-fast: false
matrix:
os:
- macOS-10.15
- macOS-11
- windows-2019
include:
- target: x86_64-apple-darwin
os: macOS-10.15
os: macOS-11
- target: aarch64-apple-darwin
os: macOS-11
- target: x86_64-pc-windows-msvc
Expand All @@ -58,64 +57,65 @@ jobs:
name: PyPI release manylinux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v3

- name: Publish manylinux to pypi x86_64 (with sdist)
uses: messense/maturin-action@main
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
with:
target: x86_64-unknown-linux-gnu
command: publish
args: -m python/Cargo.toml
- name: Publish manylinux to pypi x86_64 (with sdist)
uses: messense/maturin-action@main
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
with:
target: x86_64-unknown-linux-gnu
command: publish
args: -m python/Cargo.toml

- name: Publish manylinux to pypi aarch64 (without sdist)
uses: messense/maturin-action@main
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
with:
target: aarch64-unknown-linux-gnu
command: publish
args: -m python/Cargo.toml --no-sdist
- name: Publish manylinux to pypi aarch64 (without sdist)
uses: messense/maturin-action@main
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
with:
target: aarch64-unknown-linux-gnu
command: publish
args: -m python/Cargo.toml --no-sdist

release-docs:
needs: [validate-release-tag, release-pypi-manylinux, release-pypi-mac-windows]
needs:
[validate-release-tag, release-pypi-manylinux, release-pypi-mac-windows]
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # fetch full history for gh-pages branch checkout
- name: Install minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
override: true
- uses: actions/checkout@v2
with:
fetch-depth: 0 # fetch full history for gh-pages branch checkout
- name: Install minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
override: true

- name: Build and install deltalake
run: |
make install MATURIN_EXTRA_ARGS="--manylinux off"
- name: Build and install deltalake
run: |
make install MATURIN_EXTRA_ARGS="--manylinux off"

- name: Build Sphinx documentation
run: |
make build-documentation
mv docs/build ~/build
- name: Build Sphinx documentation
run: |
make build-documentation
mv docs/build ~/build

echo "Configuring git..."
git config --global user.name 'Github Action'
git config --global user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
echo "Configuring git..."
git config --global user.name 'Github Action'
git config --global user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY

echo "Commit to gh-pages branch..."
git reset --hard HEAD
git clean -d -fx .
git checkout gh-pages
cd ..
cp -avr ~/build/html/. ./python
PUSHED_TAG=${GITHUB_REF##*/}
git status
git add ./python
git commit -m "doc update for tag `${PUSHED_TAG}`"
git push origin gh-pages
echo "Commit to gh-pages branch..."
git reset --hard HEAD
git clean -d -fx .
git checkout gh-pages
cd ..
cp -avr ~/build/html/. ./python
PUSHED_TAG=${GITHUB_REF##*/}
git status
git add ./python
git commit -m "doc update for tag `${PUSHED_TAG}`"
git push origin gh-pages
27 changes: 4 additions & 23 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "deltalake-python"
version = "0.6.0"
version = "0.6.1"
authors = ["Qingping Hou <[email protected]>"]
homepage = "https://github.com/delta-io/delta-rs"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

VENV := venv
MATURIN_VERSION := $(shell awk -F '[ ="]+' '$$1 == "requires" { print $$4 }' pyproject.toml)
PACKAGE_VERSION := $(shell cargo pkgid | cut -d\# -f2 | cut -d: -f2)
PACKAGE_VERSION := $(shell grep version Cargo.toml | head -n 1 | awk '{print $$3}' | tr -d '"' )

.PHONY: setup-venv
setup-venv: ## Setup the virtualenv
Expand Down
16 changes: 3 additions & 13 deletions python/docs/source/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ Configuration is defined for specific backends - `s3 options`_, `azure options`_
The configuration can also be provided via the environment, and the basic service provider is derived from the URL
being used. We try to support many of the well-known formats to identify basic service properties.

__S3__:
**S3**:

* s3://<bucket>/<path>
* s3a://<bucket>/<path>

__Azure__:
**Azure**:

* az://<container>/<path>
* adl://<container>/<path>
* abfs://<container>/<path>

__GCS__:
**GCS**:

* gs://<bucket>/<path>

Expand All @@ -70,19 +70,9 @@ For AWS Glue catalog, use AWS environment variables to authenticate.
>>> dt.to_pyarrow_table().to_pydict()
{'id': [5, 7, 9, 5, 6, 7, 8, 9]}

Besides local filesystems, the following backends are supported:

* AWS S3, detected by the prefix ``s3://``. AWS credentials can be specified using
environment variables in the same way as the CLI.
* Azure Data Lake Storage Gen 2, detected by the prefix ``adls2://``. Note that
`specific instructions`_ must be followed to setup the Azure Storage Account.
* Google Cloud Storage, detected by the prefix ``gs://``.

.. _`specific instructions`: https://github.com/delta-io/delta-rs/blob/main/docs/ADLSGen2-HOWTO.md
.. _`s3 options`: https://github.com/delta-io/delta-rs/blob/17999d24a58fb4c98c6280b9e57842c346b4603a/rust/src/builder.rs#L423-L491
.. _`azure options`: https://github.com/delta-io/delta-rs/blob/17999d24a58fb4c98c6280b9e57842c346b4603a/rust/src/builder.rs#L524-L539


Time Travel
~~~~~~~~~~~

Expand Down