From 54423002a18041ed4f8d9dbbe5196cc8c5315bd1 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Sun, 15 Oct 2023 15:18:10 +0200 Subject: [PATCH 1/2] Remove python working directory This is not applicable anymore now Python has its own repository --- .github/workflows/python-release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index e537dc96d7..910b7ee003 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -25,7 +25,7 @@ on: version: description: 'Version' type: string - default: 'master' + default: 'main' jobs: @@ -50,15 +50,13 @@ jobs: - name: Set version run: python -m poetry version "${{ inputs.version }}" - working-directory: ./python - if: "${{ github.event.inputs.version != 'master' }}" + if: "${{ github.event.inputs.version != 'main' }}" # Publish the source distribution with the version that's in # the repository, otherwise the tests will fail - name: Compile source distribution run: python3 -m poetry build --format=sdist if: startsWith(matrix.os, 'ubuntu') - working-directory: ./python - name: Build wheels uses: pypa/cibuildwheel@v2.16.2 From b9dddcdc86c88a44d23353591edfa72d65b0ca07 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Sun, 15 Oct 2023 15:31:00 +0200 Subject: [PATCH 2/2] Update docs as well --- mkdocs/docs/contributing.md | 2 +- mkdocs/docs/how-to-release.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkdocs/docs/contributing.md b/mkdocs/docs/contributing.md index 87a8cc701b..3973b763a0 100644 --- a/mkdocs/docs/contributing.md +++ b/mkdocs/docs/contributing.md @@ -43,7 +43,7 @@ If you want to install the library on the host, you can simply run `pip3 install To set up IDEA with Poetry ([also on Loom](https://www.loom.com/share/6d36464d45f244729d91003e7f671fd2)): - Open up the Python project in IntelliJ -- Make sure that you're on latest master (that includes Poetry) +- Make sure that you're on latest main (that includes Poetry) - Go to File -> Project Structure (⌘;) - Go to Platform Settings -> SDKs - Click the + sign -> Add Python SDK diff --git a/mkdocs/docs/how-to-release.md b/mkdocs/docs/how-to-release.md index 32e8744ac7..db8f80665e 100644 --- a/mkdocs/docs/how-to-release.md +++ b/mkdocs/docs/how-to-release.md @@ -54,10 +54,10 @@ Both the source distribution (`sdist`) and the binary distributions (`wheels`) n Before committing the files to the Apache SVN artifact distribution SVN hashes need to be generated, and those need to be signed with gpg to make sure that they are authentic. -Go to [Github Actions and run the `Python release` action](https://github.com/apache/iceberg/actions/workflows/python-release.yml). **Set the version to master, since we cannot modify the source**. Download the zip, and sign the files: +Go to [Github Actions and run the `Python release` action](https://github.com/apache/iceberg/actions/workflows/python-release.yml). **Set the version to main, since we cannot modify the source**. Download the zip, and sign the files: ```bash -cd release-master/ +cd release-main/ for name in $(ls pyiceberg-*.whl pyiceberg-*.tar.gz) do