Skip to content

Commit b890268

Browse files
committed
fix: resolve merge conflicts with upstream main in test_inspect.py
2 parents 52b38f9 + 03ad0d6 commit b890268

48 files changed

Lines changed: 3134 additions & 474 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/check-md-link.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4343
with:
4444
persist-credentials: false
45-
- uses: tcort/github-action-markdown-link-check@e7c7a18363c842693fadde5d41a3bd3573a7a225 # v1.1.2
45+
- uses: tcort/github-action-markdown-link-check@e047c5b37f24ab722bbef1a27b6fab7f96bc4068 # v1.1.3

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ jobs:
4646
persist-credentials: false
4747

4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
49+
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
5050
with:
5151
languages: actions
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
54+
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
5555
with:
5656
category: "/language:actions"

‎.github/workflows/nightly-pypi-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Publish to TestPyPI
8989
id: publish-testpypi
9090
continue-on-error: true
91-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
91+
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
9292
with:
9393
repository-url: https://test.pypi.org/legacy/
9494
skip-existing: true

‎.github/workflows/pypi-build-artifacts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
if: matrix.os == 'ubuntu-latest'
7070

7171
- name: Build wheels
72-
uses: pypa/cibuildwheel@4726cd35bb13f7bde50cf2761f2499ac7b3aa32c # v4.1.1
72+
uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
7373
with:
7474
output-dir: wheelhouse
7575
config-file: "pyproject.toml"

‎.github/workflows/python-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9292
with:
9393
persist-credentials: false
94-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
94+
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
9595
with:
9696
python-version: ${{ matrix.python }}
9797
- name: Install UV

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.repository_owner == 'apache'
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
35+
- uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
3636
with:
3737
# stale issues
3838
stale-issue-label: 'stale'

‎.github/workflows/svn-build-artifacts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
if: matrix.os == 'ubuntu-latest'
6464

6565
- name: Build wheels
66-
uses: pypa/cibuildwheel@4726cd35bb13f7bde50cf2761f2499ac7b3aa32c # v4.1.1
66+
uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
6767
with:
6868
output-dir: wheelhouse
6969
config-file: "pyproject.toml"

‎.github/workflows/zizmor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ jobs:
3939
persist-credentials: false
4040

4141
- name: Run zizmor 🌈
42-
uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
42+
uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2
4343
with:
4444
advanced-security: false

‎dev/release/verify_rc.sh‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
#
20+
# Verifies a PyIceberg release candidate, following the steps in
21+
# mkdocs/docs/verify-release.md: signatures, checksums, license
22+
# documentation (RAT), and the test suite of the source distribution.
23+
24+
set -euo pipefail
25+
26+
if [ "$#" -ne 1 ]; then
27+
echo "Usage: $0 <version>"
28+
echo " e.g.: $0 0.6.1rc3"
29+
exit 1
30+
fi
31+
32+
PYICEBERG_VERSION="$1"
33+
# remove the rcX qualifier, the artifacts inside the RC are named after the release
34+
PYICEBERG_RELEASE_VERSION="${PYICEBERG_VERSION%rc*}"
35+
PYICEBERG_VERIFICATION_DIR="${PYICEBERG_VERIFICATION_DIR:-/tmp/pyiceberg/${PYICEBERG_VERSION}}"
36+
37+
# Set to 0 to skip a step, e.g. VERIFY_TEST=0 ./dev/release/verify_rc.sh 0.6.1rc3
38+
: "${VERIFY_SIGN:=1}"
39+
: "${VERIFY_CHECKSUM:=1}"
40+
: "${VERIFY_LICENSE:=1}"
41+
: "${VERIFY_TEST:=1}"
42+
43+
if type shasum >/dev/null 2>&1; then
44+
sha512_verify="shasum -a 512 --check"
45+
else
46+
sha512_verify="sha512sum --check"
47+
fi
48+
49+
import_gpg_keys() {
50+
echo "--- Importing KEYS"
51+
curl --fail --location --show-error --silent https://downloads.apache.org/iceberg/KEYS | gpg --import
52+
}
53+
54+
download_rc() {
55+
echo "--- Downloading pyiceberg-${PYICEBERG_VERSION}"
56+
svn checkout "https://dist.apache.org/repos/dist/dev/iceberg/pyiceberg-${PYICEBERG_VERSION}/" "${PYICEBERG_VERIFICATION_DIR}"
57+
}
58+
59+
verify_signatures() {
60+
echo "--- Verifying signatures"
61+
for name in pyiceberg-*.whl pyiceberg-*.tar.gz; do
62+
gpg --verify "${name}.asc" "${name}"
63+
done
64+
}
65+
66+
verify_checksums() {
67+
echo "--- Verifying checksums"
68+
for name in pyiceberg-*.whl.sha512 pyiceberg-*.tar.gz.sha512; do
69+
${sha512_verify} "${name}"
70+
done
71+
}
72+
73+
extract_source_distribution() {
74+
echo "--- Extracting pyiceberg-${PYICEBERG_RELEASE_VERSION}.tar.gz"
75+
tar xzf "pyiceberg-${PYICEBERG_RELEASE_VERSION}.tar.gz"
76+
}
77+
78+
verify_license_documentation() {
79+
echo "--- Running RAT checks"
80+
./dev/check-license
81+
}
82+
83+
test_source_distribution() {
84+
echo "--- Installing and running the tests, this spins up Docker containers"
85+
make install
86+
make test-coverage
87+
}
88+
89+
echo "Verifying pyiceberg-${PYICEBERG_VERSION} in ${PYICEBERG_VERIFICATION_DIR}"
90+
91+
if [ "${VERIFY_SIGN}" -gt 0 ]; then
92+
import_gpg_keys
93+
fi
94+
95+
download_rc
96+
cd "${PYICEBERG_VERIFICATION_DIR}"
97+
98+
if [ "${VERIFY_SIGN}" -gt 0 ]; then
99+
verify_signatures
100+
fi
101+
102+
if [ "${VERIFY_CHECKSUM}" -gt 0 ]; then
103+
verify_checksums
104+
fi
105+
106+
extract_source_distribution
107+
cd "pyiceberg-${PYICEBERG_RELEASE_VERSION}"
108+
109+
if [ "${VERIFY_LICENSE}" -gt 0 ]; then
110+
verify_license_documentation
111+
fi
112+
113+
if [ "${VERIFY_TEST}" -gt 0 ]; then
114+
test_source_distribution
115+
fi
116+
117+
echo "RC looks good! Cast your vote on the dev mailing list."

‎mkdocs/docs/cli.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,17 @@ Property write.metadata.delete-after-commit.enabled removed from nyc.taxis
240240
➜ pyiceberg properties get table nyc.taxis write.metadata.delete-after-commit.enabled
241241
Could not find property write.metadata.delete-after-commit.enabled on nyc.taxis
242242
```
243+
244+
You can drop a table from the catalog:
245+
246+
```sh
247+
➜ pyiceberg drop table nyc.taxis
248+
Dropped table: nyc.taxis
249+
```
250+
251+
To request purge for the underlying table files through the configured catalog, pass `--purge`:
252+
253+
```sh
254+
➜ pyiceberg drop table nyc.taxis --purge
255+
Dropped table: nyc.taxis (purge requested)
256+
```

0 commit comments

Comments
 (0)