Skip to content

Commit cd19f80

Browse files
committed
Merge branch 'main' of github.com:apache/iceberg-python into fd-add-ability-to-delete-full-data-files
2 parents 9910d29 + f72e363 commit cd19f80

File tree

13 files changed

+702
-565
lines changed

13 files changed

+702
-565
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test-integration:
4141
docker compose -f dev/docker-compose-integration.yml rm -f
4242
docker compose -f dev/docker-compose-integration.yml up -d
4343
sleep 10
44+
docker compose -f dev/docker-compose-integration.yml cp ./dev/provision.py spark-iceberg:/opt/spark/provision.py
4445
docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
4546
poetry run pytest tests/ -v -m integration ${PYTEST_ARGS}
4647

@@ -63,6 +64,8 @@ test-coverage:
6364
docker compose -f dev/docker-compose-integration.yml up -d
6465
sh ./dev/run-azurite.sh
6566
sh ./dev/run-gcs-server.sh
67+
sleep 10
68+
docker compose -f dev/docker-compose-integration.yml cp ./dev/provision.py spark-iceberg:/opt/spark/provision.py
6669
docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
6770
poetry run coverage run --source=pyiceberg/ -m pytest tests/ ${PYTEST_ARGS}
6871
poetry run coverage report -m --fail-under=90

dev/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ ENV PYTHONPATH=$SPARK_HOME/python:$SPARK_HOME/python/lib/py4j-0.10.9.7-src.zip:$
3636
RUN mkdir -p ${HADOOP_HOME} && mkdir -p ${SPARK_HOME} && mkdir -p /home/iceberg/spark-events
3737
WORKDIR ${SPARK_HOME}
3838

39-
ENV SPARK_VERSION=3.4.3
40-
ENV ICEBERG_SPARK_RUNTIME_VERSION=3.4_2.12
41-
ENV ICEBERG_VERSION=1.4.2
42-
ENV PYICEBERG_VERSION=0.5.1
39+
ENV SPARK_VERSION=3.5.0
40+
ENV ICEBERG_SPARK_RUNTIME_VERSION=3.5_2.12
41+
ENV ICEBERG_VERSION=1.5.0
42+
ENV PYICEBERG_VERSION=0.6.0
4343

4444
RUN curl --retry 3 -s -C - https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz -o spark-${SPARK_VERSION}-bin-hadoop3.tgz \
4545
&& tar xzf spark-${SPARK_VERSION}-bin-hadoop3.tgz --directory /opt/spark --strip-components 1 \

mkdocs/docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ pip3 install -e ".[s3fs,hive]"
7171
Install it directly for GitHub (not recommended), but sometimes handy:
7272

7373
```
74-
pip install "git+https://github.com/apache/iceberg-python.git#egg=pyiceberg[s3fs]"
74+
pip install "git+https://github.com/apache/iceberg-python.git#egg=pyiceberg[pyarrow]"
7575
```
7676

7777
## Linting

mkdocs/docs/how-to-release.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ https://pypi.org/project/pyiceberg/$VERSION/
143143
144144
And can be installed using: pip3 install pyiceberg==$VERSION
145145
146+
Instructions for verifying a release can be found here:
147+
148+
* https://py.iceberg.apache.org/verify-release/
149+
146150
Please download, verify, and test.
147151
148152
Please vote in the next 72 hours.

mkdocs/docs/verify-release.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,21 @@ curl https://dist.apache.org/repos/dist/dev/iceberg/KEYS -o KEYS
4444
gpg --import KEYS
4545
```
4646

47+
Set an environment variable to the version to verify and path to use
48+
49+
```sh
50+
export PYICEBERG_VERSION=<version> # e.g. 0.6.1rc3
51+
export PYICEBERG_VERIFICATION_DIR=/tmp/pyiceberg/${PYICEBERG_VERSION}
52+
```
53+
4754
Next, verify the `.asc` file.
4855

4956
```sh
50-
svn checkout https://dist.apache.org/repos/dist/dev/iceberg/pyiceberg-0.5.0rc1/ /tmp/pyiceberg/
57+
svn checkout https://dist.apache.org/repos/dist/dev/iceberg/pyiceberg-${PYICEBERG_VERSION}/ ${PYICEBERG_VERIFICATION_DIR}
58+
59+
cd ${PYICEBERG_VERIFICATION_DIR}
5160

52-
for name in $(ls /tmp/pyiceberg/pyiceberg-*.whl /tmp/pyiceberg/pyiceberg-*.tar.gz)
61+
for name in $(ls pyiceberg-*.whl pyiceberg-*.tar.gz)
5362
do
5463
gpg --verify ${name}.asc ${name}
5564
done
@@ -58,8 +67,8 @@ done
5867
## Verifying checksums
5968

6069
```sh
61-
cd /tmp/pyiceberg/
62-
for name in $(ls /tmp/pyiceberg/pyiceberg-*.whl.sha512 /tmp/pyiceberg/pyiceberg-*.tar.gz.sha512)
70+
cd ${PYICEBERG_VERIFICATION_DIR}
71+
for name in $(ls pyiceberg-*.whl.sha512 pyiceberg-*.tar.gz.sha512)
6372
do
6473
shasum -a 512 --check ${name}
6574
done
@@ -68,8 +77,9 @@ done
6877
## Verifying License Documentation
6978

7079
```sh
71-
tar xzf pyiceberg-0.5.0.tar.gz
72-
cd pyiceberg-0.5.0
80+
export PYICEBERG_RELEASE_VERSION=${PYICEBERG_VERSION/rc?/} # remove rcX qualifier
81+
tar xzf pyiceberg-${PYICEBERG_RELEASE_VERSION}.tar.gz
82+
cd pyiceberg-${PYICEBERG_RELEASE_VERSION}
7383
```
7484

7585
Run RAT checks to validate license header:
@@ -102,18 +112,20 @@ And then run the tests:
102112
make test
103113
```
104114

105-
To run the full integration tests:
115+
To run the full test coverage:
106116

107117
```sh
108-
make test-s3
118+
make test-coverage
109119
```
110120

111-
This will include a Minio S3 container being spun up.
121+
This will spin up Docker containers to faciliate running test coverage.
112122

113123
# Cast the vote
114124

115125
Votes are cast by replying to the release candidate announcement email on the dev mailing list with either `+1`, `0`, or `-1`. For example :
116126

117-
> \[ \] +1 Release this as PyIceberg 0.3.0 \[ \] +0 \[ \] -1 Do not release this because…
127+
> \[ \] +1 Release this as PyIceberg 0.3.0 <br>
128+
> \[ \] +0 <br>
129+
> \[ \] -1 Do not release this because… <br>
118130
119131
In addition to your vote, it’s customary to specify if your vote is binding or non-binding. Only members of the Project Management Committee have formally binding votes. If you’re unsure, you can specify that your vote is non-binding. To read more about voting in the Apache framework, checkout the [Voting](https://www.apache.org/foundation/voting.html) information page on the Apache foundation’s website.

mkdocs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ mkdocstrings-python==1.8.0
2323
mkdocs-literate-nav==0.6.1
2424
mkdocs-autorefs==0.5.0
2525
mkdocs-gen-files==0.5.0
26-
mkdocs-material==9.5.10
26+
mkdocs-material==9.5.18
2727
mkdocs-material-extensions==1.3.1
2828
mkdocs-section-index==0.3.8

0 commit comments

Comments
 (0)