Skip to content

Commit

Permalink
chore: rename package to google-cloud-dataflow-client (#4)
Browse files Browse the repository at this point in the history
* chore: rename package to google-cloud-dataflow-client

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md

* chore: add license header to .Owlbot.lock.yaml

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
parthea and gcf-owl-bot[bot] authored Jun 29, 2021
1 parent 79d33e7 commit 7653220
Show file tree
Hide file tree
Showing 24 changed files with 83 additions and 69 deletions.
14 changes: 14 additions & 0 deletions packages/google-cloud-dataflow-client/.github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

docker:
image: gcr.io/repo-automation-bots/owlbot-python:latest
digest: sha256:99d90d097e4a4710cc8658ee0b5b963f4426d0e424819787c3ac1405c9a26719
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Thanks for stopping by to let us know something could be better!

Please run down the following list and make sure you've tried the usual "quick fixes":

- Search the issues already opened: https://github.com/googleapis/python-dataflow/issues
- Search the issues already opened: https://github.com/googleapis/python-dataflow-client/issues
- Search StackOverflow: https://stackoverflow.com/questions/tagged/google-cloud-platform+python

If you are still having issues, please be sure to include as much information as possible:
Expand All @@ -20,7 +20,7 @@ If you are still having issues, please be sure to include as much information as
- OS type and version:
- Python version: `python --version`
- pip version: `pip --version`
- `google-cloud-dataflow` version: `pip show google-cloud-dataflow`
- `google-cloud-dataflow-client` version: `pip show google-cloud-dataflow-client`

#### Steps to reproduce

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-dataflow/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-dataflow-client/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-dataflow-client/.kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
set -eo pipefail

if [[ -z "${PROJECT_ROOT:-}" ]]; then
PROJECT_ROOT="github/python-dataflow"
PROJECT_ROOT="github/python-dataflow-client"
fi

cd "${PROJECT_ROOT}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -23,5 +23,5 @@ env_vars: {
}
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/build.sh"
value: "github/python-dataflow-client/.kokoro/build.sh"
}
4 changes: 2 additions & 2 deletions packages/google-cloud-dataflow-client/.kokoro/docs/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline_v2.sh"
build_file: "python-dataflow-client/.kokoro/trampoline_v2.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -20,7 +20,7 @@ env_vars: {
}
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/publish-docs.sh"
value: "github/python-dataflow-client/.kokoro/publish-docs.sh"
}

env_vars: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/build.sh"
value: "github/python-dataflow-client/.kokoro/build.sh"
}

# Only run this nox session.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -23,5 +23,5 @@ env_vars: {
}
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/build.sh"
value: "github/python-dataflow-client/.kokoro/build.sh"
}
2 changes: 1 addition & 1 deletion packages/google-cloud-dataflow-client/.kokoro/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ export PYTHONUNBUFFERED=1

# Move into the package, build the distribution and upload.
TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token")
cd github/python-dataflow
cd github/python-dataflow-client
python3 setup.py sdist bdist_wheel
twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -20,7 +20,7 @@ env_vars: {
}
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/release.sh"
value: "github/python-dataflow-client/.kokoro/release.sh"
}

# Tokens needed to report release status back to GitHub
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/test-samples.sh"
value: "github/python-dataflow-client/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
Expand All @@ -31,4 +31,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/test-samples.sh"
value: "github/python-dataflow-client/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
Expand All @@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/test-samples.sh"
value: "github/python-dataflow-client/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
Expand All @@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/test-samples.sh"
value: "github/python-dataflow-client/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
Expand All @@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-dataflow/.kokoro/test-samples.sh"
value: "github/python-dataflow-client/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
Expand All @@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-dataflow/.kokoro/trampoline.sh"
build_file: "python-dataflow-client/.kokoro/trampoline.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ set -eo pipefail
# Enables `**` to include files nested inside sub-folders
shopt -s globstar

cd github/python-dataflow
cd github/python-dataflow-client

exec .kokoro/test-samples-impl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -eo pipefail
# Enables `**` to include files nested inside sub-folders
shopt -s globstar

cd github/python-dataflow
cd github/python-dataflow-client

# Run periodic samples tests at latest release
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
Expand Down
4 changes: 2 additions & 2 deletions packages/google-cloud-dataflow-client/.repo-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"release_level": "beta",
"language": "python",
"library_type": "GAPIC_AUTO",
"repo": "googleapis/python-dataflow",
"distribution_name": "google-cloud-dataflow",
"repo": "googleapis/python-dataflow-client",
"distribution_name": "google-cloud-dataflow-client",
"api_id": "dataflow.googleapis.com"
}
26 changes: 13 additions & 13 deletions packages/google-cloud-dataflow-client/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ Using a Development Checkout
You'll have to create a development environment using a Git checkout:

- While logged into your GitHub account, navigate to the
``python-dataflow`` `repo`_ on GitHub.
``python-dataflow-client`` `repo`_ on GitHub.

- Fork and clone the ``python-dataflow`` repository to your GitHub account by
- Fork and clone the ``python-dataflow-client`` repository to your GitHub account by
clicking the "Fork" button.

- Clone your fork of ``python-dataflow`` from your GitHub account to your local
- Clone your fork of ``python-dataflow-client`` from your GitHub account to your local
computer, substituting your account username and specifying the destination
as ``hack-on-python-dataflow``. E.g.::
as ``hack-on-python-dataflow-client``. E.g.::

$ cd ${HOME}
$ git clone git@github.com:USERNAME/python-dataflow.git hack-on-python-dataflow
$ cd hack-on-python-dataflow
# Configure remotes such that you can pull changes from the googleapis/python-dataflow
$ git clone git@github.com:USERNAME/python-dataflow-client.git hack-on-python-dataflow-client
$ cd hack-on-python-dataflow-client
# Configure remotes such that you can pull changes from the googleapis/python-dataflow-client
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-dataflow.git
$ git remote add upstream git@github.com:googleapis/python-dataflow-client.git
# fetch and merge changes from upstream into master
$ git fetch upstream
$ git merge upstream/master
Expand All @@ -60,7 +60,7 @@ repo, from which you can submit a pull request.
To work on the codebase and run the tests, we recommend using ``nox``,
but you can also use a ``virtualenv`` of your own creation.

.. _repo: https://github.com/googleapis/python-dataflow
.. _repo: https://github.com/googleapis/python-dataflow-client

Using ``nox``
=============
Expand Down Expand Up @@ -113,7 +113,7 @@ Coding Style
export GOOGLE_CLOUD_TESTING_BRANCH="master"

By doing this, you are specifying the location of the most up-to-date
version of ``python-dataflow``. The the suggested remote name ``upstream``
version of ``python-dataflow-client``. The the suggested remote name ``upstream``
should point to the official ``googleapis`` checkout and the
the branch should be the main branch on that remote (``master``).

Expand Down Expand Up @@ -185,10 +185,10 @@ The `description on PyPI`_ for the project comes directly from the
``README``. Due to the reStructuredText (``rst``) parser used by
PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
instead of
``https://github.com/googleapis/python-dataflow/blob/master/CONTRIBUTING.rst``)
``https://github.com/googleapis/python-dataflow-client/blob/master/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.

.. _description on PyPI: https://pypi.org/project/google-cloud-dataflow
.. _description on PyPI: https://pypi.org/project/google-cloud-dataflow-client


*************************
Expand All @@ -210,7 +210,7 @@ We support:

Supported versions can be found in our ``noxfile.py`` `config`_.

.. _config: https://github.com/googleapis/python-dataflow/blob/master/noxfile.py
.. _config: https://github.com/googleapis/python-dataflow-client/blob/master/noxfile.py


We also explicitly decided to support Python 3 beginning with version 3.6.
Expand Down
12 changes: 6 additions & 6 deletions packages/google-cloud-dataflow-client/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Python Client for Cloud Dataflow

.. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg
:target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow.svg
:target: https://pypi.org/project/google-cloud-dataflow/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow.svg
:target: https://pypi.org/project/google-cloud-dataflow/
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow-client.svg
:target: https://pypi.org/project/google-cloud-dataflow-client/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow-client.svg
:target: https://pypi.org/project/google-cloud-dataflow-client/
.. _Cloud Dataflow: https://cloud.google.com/dataflow/
.. _Client Library Documentation: https://googleapis.dev/python/dataflow/latest
.. _Product Documentation: https://cloud.google.com/dataflow/
Expand Down Expand Up @@ -55,7 +55,7 @@ Mac/Linux
pip install virtualenv
virtualenv <your-env>
source <your-env>/bin/activate
<your-env>/bin/pip install google-cloud-dataflow
<your-env>/bin/pip install google-cloud-dataflow-client
Windows
Expand All @@ -66,7 +66,7 @@ Windows
pip install virtualenv
virtualenv <your-env>
<your-env>\Scripts\activate
<your-env>\Scripts\pip.exe install google-cloud-dataflow
<your-env>\Scripts\pip.exe install google-cloud-dataflow-client
Next Steps
~~~~~~~~~~
Expand Down
12 changes: 6 additions & 6 deletions packages/google-cloud-dataflow-client/docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Python Client for Cloud Dataflow

.. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg
:target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow.svg
:target: https://pypi.org/project/google-cloud-dataflow/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow.svg
:target: https://pypi.org/project/google-cloud-dataflow/
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dataflow-client.svg
:target: https://pypi.org/project/google-cloud-dataflow-client/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataflow-client.svg
:target: https://pypi.org/project/google-cloud-dataflow-client/
.. _Cloud Dataflow: https://cloud.google.com/dataflow/
.. _Client Library Documentation: https://googleapis.dev/python/dataflow/latest
.. _Product Documentation: https://cloud.google.com/dataflow/
Expand Down Expand Up @@ -55,7 +55,7 @@ Mac/Linux
pip install virtualenv
virtualenv <your-env>
source <your-env>/bin/activate
<your-env>/bin/pip install google-cloud-dataflow
<your-env>/bin/pip install google-cloud-dataflow-client
Windows
Expand All @@ -66,7 +66,7 @@ Windows
pip install virtualenv
virtualenv <your-env>
<your-env>\Scripts\activate
<your-env>\Scripts\pip.exe install google-cloud-dataflow
<your-env>\Scripts\pip.exe install google-cloud-dataflow-client
Next Steps
~~~~~~~~~~
Expand Down
Loading

0 comments on commit 7653220

Please sign in to comment.