Skip to content

Commit 9466983

Browse files
kevinjqliuCopilot
andcommitted
Move urgent PR merge docs to end of contributing guide
Keep the committer-only procedure out of the contributor setup flow, and indent the code block 4 spaces so mkdocs renders it inside the list. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent e7024bb commit 9466983

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

‎mkdocs/docs/contributing.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -263,20 +263,6 @@ This command spins up the full integration test infrastructure via Docker Compos
263263

264264
After running `make notebook-infra`, open `spark_integration_example.ipynb` in the Jupyter Lab interface to explore Spark integration capabilities.
265265

266-
## Merging an urgent PR
267-
268-
Committers can merge an urgent, approved pull request without waiting for the merge queue or required checks (for example, a security fix while CI is stuck). Use this only when necessary; otherwise, let the merge queue run.
269-
270-
<!-- markdown-link-check-disable-next-line -->
271-
1. Join the [`apache/iceberg-public`](https://github.com/orgs/apache/teams/iceberg-public) team via [Boxer](https://gitbox.apache.org/boxer/) (one-time; membership syncs in about 15 minutes).
272-
2. Get the pull request approved by a committer.
273-
3. If the pull request is in the merge queue, click **Remove from queue**.
274-
4. Merge it directly:
275-
276-
```sh
277-
gh pr merge <number> --squash --admin
278-
```
279-
280266
## Code standards
281267

282268
Below are the formalized conventions that we adhere to in the PyIceberg project. The goal of this is to have a common agreement on how to evolve the codebase, but also using it as guidelines for newcomers to the project.
@@ -352,3 +338,17 @@ For the type annotation the types from the `Typing` package are used.
352338
### Third party libraries
353339

354340
PyIceberg naturally integrates into the rich Python ecosystem, however it is important to be hesitant adding third party packages. Adding a lot of packages makes the library heavyweight, and causes incompatibilities with other projects if they use a different version of the library. Also, big libraries such as `s3fs`, `adlfs`, `pyarrow`, `thrift` should be optional to avoid downloading everything, while not being sure if is actually being used.
341+
342+
## Merging an urgent PR
343+
344+
Committers can merge an urgent, approved pull request without waiting for the merge queue or required checks (for example, a security fix while CI is stuck). Use this only when necessary; otherwise, let the merge queue run.
345+
346+
<!-- markdown-link-check-disable-next-line -->
347+
1. Join the [`apache/iceberg-public`](https://github.com/orgs/apache/teams/iceberg-public) team via [Boxer](https://gitbox.apache.org/boxer/) (one-time; membership syncs in about 15 minutes).
348+
2. Get the pull request approved by a committer.
349+
3. If the pull request is in the merge queue, click **Remove from queue**.
350+
4. Merge it directly:
351+
352+
```sh
353+
gh pr merge <number> --squash --admin
354+
```

0 commit comments

Comments
 (0)