Skip to content

Commit

Permalink
Merge branch 'main' into update/tensorflow-core-api-0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward committed Sep 13, 2023
2 parents 5ac4276 + a2a49ff commit aab9f76
Show file tree
Hide file tree
Showing 123 changed files with 3,205 additions and 694 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ bfe19393b17710f92b61ea80e6e5f4e026ea2676

# Scala Steward: Reformat with scalafmt 3.7.3
8a5eb7068f8d25459e6080ededa252c4000baad9

# Scala Steward: Reformat with scalafmt 3.7.5
5413512ebb1e49de9bbedd32b6964c84e08366a4
8 changes: 4 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
checks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java 11 setup
Expand All @@ -24,7 +24,7 @@ jobs:
scalafix-rules:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java 11 setup
Expand All @@ -37,7 +37,7 @@ jobs:
dependencies:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java 11 setup
Expand All @@ -49,7 +49,7 @@ jobs:
mimaReport:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: cache SBT
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-graph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
name: Update Dependency Graph
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: scalacenter/sbt-dependency-submission@v2
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
publish-repl:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java 11 setup
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout tag
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand All @@ -49,7 +49,7 @@ jobs:
SOCCO: true
_JAVA_OPTIONS: "-Xmx1500m"
- name: Deploy
uses: JamesIves/[email protected].2
uses: JamesIves/[email protected].3
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/it-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
it-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout current branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/populate-it-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
populate-integration-test-data:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test-dataflow:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-gh-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout tag
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}
Expand All @@ -30,7 +30,7 @@ jobs:
SOCCO: true
_JAVA_OPTIONS: "-Xmx1500m"
- name: Deploy
uses: JamesIves/[email protected].2
uses: JamesIves/[email protected].3
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: cache SBT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java ${{matrix.java}} setup
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
repl-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cache SBT
uses: coursier/cache-action@v6
- name: Java ${{matrix.java}} setup
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.4"
version = "3.7.14"
runner.dialect = scala213source3

fileOverride {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cat wc/part-00000-of-00004.txt

# Documentation

[Getting Started](https://spotify.github.io/scio/Getting-Started.html) is the best place to start with Scio. If you are new to Apache Beam and distributed data processing, check out the [Beam Programming Guide](https://beam.apache.org/documentation/programming-guide/) first for a detailed explanation of the Beam programming model and concepts. If you have experience with other Scala data processing libraries, check out this comparison between [Scio, Scalding and Spark](https://spotify.github.io/scio/Scio,-Scalding-and-Spark.html). Finally check out this document about the relationship between [Scio, Beam and Dataflow](https://spotify.github.io/scio/Scio,-Beam-and-Dataflow.html).
[Getting Started](https://spotify.github.io/scio/Getting-Started.html) is the best place to start with Scio. If you are new to Apache Beam and distributed data processing, check out the [Beam Programming Guide](https://beam.apache.org/documentation/programming-guide/) first for a detailed explanation of the Beam programming model and concepts. If you have experience with other Scala data processing libraries, check out this comparison between [Scio, Scalding and Spark](https://spotify.github.io/scio/Scio,-Scalding-and-Spark.html).

Example Scio pipelines and tests can be found under [scio-examples](https://github.com/spotify/scio/tree/master/scio-examples/src). A lot of them are direct ports from Beam's Java [examples](https://github.com/apache/beam/tree/master/examples). See this [page](http://spotify.github.io/scio/examples/) for some of them with side-by-side explanation. Also see [Big Data Rosetta Code](https://github.com/spotify/big-data-rosetta-code) for common data processing code snippets in Scio, Scalding and Spark.

Expand Down
Loading

0 comments on commit aab9f76

Please sign in to comment.