diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 9ee60f7..a9fcd07 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-python:latest
- digest: sha256:aea14a583128771ae8aefa364e1652f3c56070168ef31beb203534222d842b8b
+ digest: sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 848d6cf..79b3b3b 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
python3 -m nox --version
# If this is a continuous build, send the test log to the FlakyBot.
-# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
+# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
cleanup() {
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh
index 311a8d5..8a324c9 100755
--- a/.kokoro/test-samples-impl.sh
+++ b/.kokoro/test-samples-impl.sh
@@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
EXIT=$?
# If this is a periodic build, send the test log to the FlakyBot.
- # See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
+ # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
$KOKORO_GFILE_DIR/linux_amd64/flakybot
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 4939444..dca1bd1 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -4,7 +4,7 @@
"product_documentation": "https://cloud.google.com/data-fusion",
"client_documentation": "https://googleapis.dev/python/datafusion/latest",
"issue_tracker": "",
- "release_level": "beta",
+ "release_level": "ga",
"language": "python",
"library_type": "GAPIC_AUTO",
"repo": "googleapis/python-data-fusion",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70234de..dcf4ae8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [1.0.0](https://www.github.com/googleapis/python-data-fusion/compare/v0.1.2...v1.0.0) (2021-08-24)
+
+
+### Features
+
+* bump release level to production/stable ([#14](https://www.github.com/googleapis/python-data-fusion/issues/14)) ([26f5506](https://www.github.com/googleapis/python-data-fusion/commit/26f5506b24453c6764f41637c18c6ceb10a9ba3c))
+
+
+### Documentation
+
+* migrate to main branch ([#20](https://www.github.com/googleapis/python-data-fusion/issues/20)) ([7edab48](https://www.github.com/googleapis/python-data-fusion/commit/7edab48370aeb6194f864bc2d402b8ffa7761a51))
+
### [0.1.2](https://www.github.com/googleapis/python-data-fusion/compare/v0.1.1...v0.1.2) (2021-07-29)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index faf8517..3853c46 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout:
# Configure remotes such that you can pull changes from the googleapis/python-data-fusion
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-data-fusion.git
- # fetch and merge changes from upstream into master
+ # fetch and merge changes from upstream into main
$ git fetch upstream
- $ git merge upstream/master
+ $ git merge upstream/main
Now your local repo is set up such that you will push changes to your GitHub
repo, from which you can submit a pull request.
@@ -110,12 +110,12 @@ Coding Style
variables::
export GOOGLE_CLOUD_TESTING_REMOTE="upstream"
- export GOOGLE_CLOUD_TESTING_BRANCH="master"
+ export GOOGLE_CLOUD_TESTING_BRANCH="main"
By doing this, you are specifying the location of the most up-to-date
version of ``python-data-fusion``. 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``).
+ the branch should be the main branch on that remote (``main``).
- This repository contains configuration for the
`pre-commit `__ tool, which automates checking
@@ -209,7 +209,7 @@ 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-data-fusion/blob/master/CONTRIBUTING.rst``)
+``https://github.com/googleapis/python-data-fusion/blob/main/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.
.. _description on PyPI: https://pypi.org/project/google-cloud-data-fusion
@@ -234,7 +234,7 @@ We support:
Supported versions can be found in our ``noxfile.py`` `config`_.
-.. _config: https://github.com/googleapis/python-data-fusion/blob/master/noxfile.py
+.. _config: https://github.com/googleapis/python-data-fusion/blob/main/noxfile.py
We also explicitly decided to support Python 3 beginning with version 3.6.
diff --git a/README.rst b/README.rst
index 2ef40d8..cbfb900 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
Python Client for Cloud Data Fusion
===================================
-|beta| |pypi| |versions|
+|ga| |pypi| |versions|
`Cloud Data Fusion`_: helps users build scalable, distributed data lakes on Google Cloud by integrating
data from siloed on-premises platforms.
@@ -9,8 +9,8 @@ data from siloed on-premises platforms.
- `Client Library Documentation`_
- `Product Documentation`_
-.. |beta| image:: https://img.shields.io/badge/support-beta-gold.svg
- :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability
+.. |ga| image:: https://img.shields.io/badge/support-ga-gold.svg
+ :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-data-fusion.svg
:target: https://pypi.org/project/google-cloud-data-fusion/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-data-fusion.svg
@@ -80,4 +80,4 @@ Next Steps
APIs that we cover.
.. _Cloud Data Fusion Product documentation: https://cloud.google.com/data-fusion/docs
-.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst
\ No newline at end of file
+.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst
\ No newline at end of file
diff --git a/docs/README.rst b/docs/README.rst
deleted file mode 100644
index 2ef40d8..0000000
--- a/docs/README.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-Python Client for Cloud Data Fusion
-===================================
-
-|beta| |pypi| |versions|
-
-`Cloud Data Fusion`_: helps users build scalable, distributed data lakes on Google Cloud by integrating
-data from siloed on-premises platforms.
-
-- `Client Library Documentation`_
-- `Product Documentation`_
-
-.. |beta| image:: https://img.shields.io/badge/support-beta-gold.svg
- :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability
-.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-data-fusion.svg
- :target: https://pypi.org/project/google-cloud-data-fusion/
-.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-data-fusion.svg
- :target: https://pypi.org/project/google-cloud-data-fusion/
-.. _Cloud Data Fusion: https://cloud.google.com/data-fusion
-.. _Client Library Documentation: https://googleapis.dev/python/datafusion/latest
-.. _Product Documentation: https://cloud.google.com/data-fusion/docs
-
-Quick Start
------------
-
-In order to use this library, you first need to go through the following steps:
-
-1. `Select or create a Cloud Platform project.`_
-2. `Enable billing for your project.`_
-3. `Enable the Cloud Data Fusion API.`_
-4. `Setup Authentication.`_
-
-.. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-.. _Enable billing for your project.: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project
-.. _Enable the Cloud Data Fusion API.: https://cloud.google.com/data-fusion/docs/quickstart#before-you-begin
-.. _Setup Authentication.: https://googleapis.dev/python/google-api-core/latest/auth.html
-
-Installation
-~~~~~~~~~~~~
-
-Install this library in a `virtualenv`_ using pip. `virtualenv`_ is a tool to
-create isolated Python environments. The basic problem it addresses is one of
-dependencies and versions, and indirectly permissions.
-
-With `virtualenv`_, it's possible to install this library without needing system
-install permissions, and without clashing with the installed system
-dependencies.
-
-.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/
-
-
-Mac/Linux
-^^^^^^^^^
-
-.. code-block:: console
-
- pip install virtualenv
- virtualenv
- source /bin/activate
- /bin/pip install google-cloud-data-fusion
-
-
-Windows
-^^^^^^^
-
-.. code-block:: console
-
- pip install virtualenv
- virtualenv
- \Scripts\activate
- \Scripts\pip.exe install google-cloud-data-fusion
-
-Next Steps
-~~~~~~~~~~
-
-- Read the `Client Library Documentation`_ for Cloud Data Fusion
- to see other available methods on the client.
-- Read the `Cloud Data Fusion Product documentation`_ to learn
- more about the product and see How-to Guides.
-- View this `README`_ to see the full list of Cloud
- APIs that we cover.
-
-.. _Cloud Data Fusion Product documentation: https://cloud.google.com/data-fusion/docs
-.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst
\ No newline at end of file
diff --git a/docs/README.rst b/docs/README.rst
new file mode 120000
index 0000000..89a0106
--- /dev/null
+++ b/docs/README.rst
@@ -0,0 +1 @@
+../README.rst
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index f47ed0e..6c730df 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,8 +76,8 @@
# The encoding of source files.
# source_encoding = 'utf-8-sig'
-# The master toctree document.
-master_doc = "index"
+# The main toctree document.
+root_doc = "index"
# General information about the project.
project = "google-cloud-data-fusion"
@@ -110,6 +110,7 @@
# directories to ignore when looking for source files.
exclude_patterns = [
"_build",
+ "**/.nox/**/*",
"samples/AUTHORING_GUIDE.md",
"samples/CONTRIBUTING.md",
"samples/snippets/README.rst",
@@ -279,7 +280,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
- master_doc,
+ root_doc,
"google-cloud-data-fusion.tex",
"google-cloud-data-fusion Documentation",
author,
@@ -314,7 +315,7 @@
# (source start file, name, description, authors, manual section).
man_pages = [
(
- master_doc,
+ root_doc,
"google-cloud-data-fusion",
"google-cloud-data-fusion Documentation",
[author],
@@ -333,7 +334,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
- master_doc,
+ root_doc,
"google-cloud-data-fusion",
"google-cloud-data-fusion Documentation",
author,
diff --git a/noxfile.py b/noxfile.py
index d896e7f..935a924 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -84,9 +84,15 @@ def default(session):
constraints_path = str(
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
)
- session.install("asyncmock", "pytest-asyncio", "-c", constraints_path)
-
- session.install("mock", "pytest", "pytest-cov", "-c", constraints_path)
+ session.install(
+ "mock",
+ "asyncmock",
+ "pytest",
+ "pytest-cov",
+ "pytest-asyncio",
+ "-c",
+ constraints_path,
+ )
session.install("-e", ".", "-c", constraints_path)
diff --git a/owlbot.py b/owlbot.py
index c46eb2b..e01d08e 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -31,6 +31,7 @@
# ----------------------------------------------------------------------------
templated_files = gcp.CommonTemplates().py_library(microgenerator=True)
+python.py_samples(skip_readmes=True)
s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file
# ----------------------------------------------------------------------------
@@ -38,3 +39,38 @@
# ----------------------------------------------------------------------------
s.shell.run(["nox", "-s", "blacken"], hide_output=False)
+
+# ----------------------------------------------------------------------------
+# Main Branch migration
+# ----------------------------------------------------------------------------
+
+s.replace(
+ "*.rst",
+ "master",
+ "main"
+)
+
+s.replace(
+ "CONTRIBUTING.rst",
+ "kubernetes/community/blob/main",
+ "kubernetes/community/blob/master"
+)
+
+s.replace(
+ "docs/conf.py",
+ "master",
+ "main"
+)
+
+s.replace(
+ "docs/conf.py",
+ "main_doc",
+ "root_doc"
+)
+
+s.replace(
+ ".kokoro/*",
+ "master",
+ "main"
+)
+
diff --git a/scripts/readme-gen/templates/install_deps.tmpl.rst b/scripts/readme-gen/templates/install_deps.tmpl.rst
index a0406db..275d649 100644
--- a/scripts/readme-gen/templates/install_deps.tmpl.rst
+++ b/scripts/readme-gen/templates/install_deps.tmpl.rst
@@ -12,7 +12,7 @@ Install Dependencies
.. _Python Development Environment Setup Guide:
https://cloud.google.com/python/setup
-#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+.
+#. Create a virtualenv. Samples are compatible with Python 3.6+.
.. code-block:: bash
diff --git a/setup.py b/setup.py
index 7333978..ed1cbfc 100644
--- a/setup.py
+++ b/setup.py
@@ -22,8 +22,8 @@
name = "google-cloud-data-fusion"
description = "Cloud Data Fusion API client library"
-version = "0.1.2"
-release_status = "Development Status :: 4 - Beta"
+version = "1.0.0"
+release_status = "Development Status :: 5 - Production/Stable"
url = "https://github.com/googleapis/python-data-fusion"
dependencies = [
# NOTE: Maintainers, please do not require google-api-core>=2.x.x