Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
jbonofre committed Oct 5, 2023
1 parent a960d43 commit 2648878
Show file tree
Hide file tree
Showing 17 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-binary-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "API Binary Compatibility Checks"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delta-conversion-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Delta Conversion CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flink-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Flink CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hive-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Hive CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Java CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/open-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Open-API"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Python CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Python Integration"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
version:
description: 'Version'
type: string
default: 'master'
default: 'main'


jobs:
Expand All @@ -51,7 +51,7 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spark-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: "Spark CI"
on:
push:
branches:
- 'master'
- 'main'
- '0.**'
tags:
- 'apache-iceberg-**'
Expand Down Expand Up @@ -143,4 +143,4 @@ jobs:
with:
name: test logs
path: |
**/build/testlogs
**/build/testlogs
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ The core Java library that tracks table snapshots and metadata is complete, but

The [Iceberg format specification][iceberg-spec] is being actively updated and is open for comment. Until the specification is complete and released, it carries no compatibility guarantees. The spec is currently evolving as the Java reference implementation changes.

[Java API javadocs][iceberg-javadocs] are available for the master.
[Java API javadocs][iceberg-javadocs] are available for the main branch.

[iceberg-javadocs]: https://iceberg.apache.org/javadoc/master
[iceberg-javadocs]: https://iceberg.apache.org/javadoc/main
[iceberg-spec]: https://iceberg.apache.org/spec


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ subprojects {
"\nAPI/ABI breaks detected.\n" +
"Adding RevAPI breaks should only be done after going through a deprecation cycle." +
"\nPlease make sure to follow the deprecation rules defined in\n" +
"https://github.com/apache/iceberg/blob/master/CONTRIBUTING.md#semantic-versioning.\n" +
"https://github.com/apache/iceberg/blob/main/CONTRIBUTING.md#semantic-versioning.\n" +
"==================================================================================")
}
onlyIf {
Expand Down
4 changes: 2 additions & 2 deletions docs/flink-writes.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ FlinkSink.forRowData(input)
env.execute("Test Iceberg DataStream");
```

The iceberg API also allows users to write generic `DataStream<T>` to iceberg table, more example could be found in this [unit test](https://github.com/apache/iceberg/blob/master/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java).
The iceberg API also allows users to write generic `DataStream<T>` to iceberg table, more example could be found in this [unit test](https://github.com/apache/iceberg/blob/main/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java).

### Overwrite data

Expand Down Expand Up @@ -270,4 +270,4 @@ INSERT INTO tableName /*+ OPTIONS('upsert-enabled'='true') */
...
```

Check out all the options here: [write-options](/flink-configuration#write-options)
Check out all the options here: [write-options](/flink-configuration#write-options)
4 changes: 2 additions & 2 deletions docs/metrics-reporting.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ CommitReport{

### [`RESTMetricsReporter`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTMetricsReporter.html)

This is the default when using the [`RESTCatalog`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTCatalog.html) and its purpose is to send metrics to a REST server at the `/v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics` endpoint as defined in the [REST OpenAPI spec](https://github.com/apache/iceberg/blob/master/open-api/rest-catalog-open-api.yaml).
This is the default when using the [`RESTCatalog`](../../../javadoc/{{% icebergVersion %}}/org/apache/iceberg/rest/RESTCatalog.html) and its purpose is to send metrics to a REST server at the `/v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics` endpoint as defined in the [REST OpenAPI spec](https://github.com/apache/iceberg/blob/main/open-api/rest-catalog-open-api.yaml).

Sending metrics via REST can be controlled with the `rest-metrics-reporting-enabled` (defaults to `true`) property.

Expand Down Expand Up @@ -171,4 +171,4 @@ TableScan tableScan =
try (CloseableIterable<FileScanTask> fileScanTasks = tableScan.planFiles()) {
// ...
}
```
```
2 changes: 1 addition & 1 deletion python/mkdocs/docs/how-to-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ 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
for name in $(ls release-master/pyiceberg-*.whl release-master/pyiceberg-*.tar.gz)
Expand Down
2 changes: 1 addition & 1 deletion python/mkdocs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
---
site_name: PyIceberg
site_url: https://py.iceberg.apache.org/
repo_url: "https://github.com/apache/iceberg/tree/master/python"
repo_url: "https://github.com/apache/iceberg/tree/main/python"
repo_name: "apache/iceberg/python"

plugins:
Expand Down
2 changes: 1 addition & 1 deletion python/pyiceberg/cli/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def table(ctx: Context, identifier: str, property_name: str) -> None: # noqa: F
if property_name in table.metadata.properties:
# We should think of the process here
# Do we want something similar as in Java:
# https://github.com/apache/iceberg/blob/master/api/src/main/java/org/apache/iceberg/Table.java#L178
# https://github.com/apache/iceberg/blob/main/api/src/main/java/org/apache/iceberg/Table.java#L178
del table.metadata.properties
output.exception(NotImplementedError("Writing is WIP"))
ctx.exit(1)
Expand Down

0 comments on commit 2648878

Please sign in to comment.