Skip to content
This repository was archived by the owner on Dec 17, 2023. It is now read-only.

Commit 912518b

Browse files
fix: require python 3.7+ (#535)
* chore(python): drop python 3.6 Source-Link: googleapis/synthtool@4f89b13 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c * add api_description to .repo-metadata.json * require python 3.7+ in setup.py * remove python 3.6 sample configs * remove require check for python 3.6 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent 069c71e commit 912518b

16 files changed

+133
-171
lines changed

.github/.OwlBot.lock.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:65e656411895bff71cffcae97246966460160028f253c2e45b7a25d805a5b142
17-
# created: 2022-06-12T13:11:45.905884945Z
16+
digest: sha256:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c
17+
# created: 2022-07-05T18:31:20.838186805Z

.github/sync-repo-settings.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ branchProtectionRules:
1212
- 'docs'
1313
- 'docfx'
1414
- 'lint'
15-
- 'unit (3.6)'
1615
- 'unit (3.7)'
1716
- 'unit (3.8)'
1817
- 'unit (3.9)'

.github/workflows/unittest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
11+
python: ['3.7', '3.8', '3.9', '3.10']
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3

.kokoro/samples/python3.6/common.cfg

-40
This file was deleted.

.kokoro/samples/python3.6/continuous.cfg

-7
This file was deleted.

.kokoro/samples/python3.6/periodic-head.cfg

-11
This file was deleted.

.kokoro/samples/python3.6/periodic.cfg

-6
This file was deleted.

.kokoro/samples/python3.6/presubmit.cfg

-6
This file was deleted.

.kokoro/test-samples-impl.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export PYTHONUNBUFFERED=1
3333
env | grep KOKORO
3434

3535
# Install nox
36-
python3.6 -m pip install --upgrade --quiet nox
36+
python3.9 -m pip install --upgrade --quiet nox
3737

3838
# Use secrets acessor service account to get secrets
3939
if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
@@ -76,7 +76,7 @@ for file in samples/**/requirements.txt; do
7676
echo "------------------------------------------------------------"
7777

7878
# Use nox to execute the tests for the project.
79-
python3.6 -m nox -s "$RUN_TESTS_SESSION"
79+
python3.9 -m nox -s "$RUN_TESTS_SESSION"
8080
EXIT=$?
8181

8282
# If this is a periodic build, send the test log to the FlakyBot.

.repo-metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
"requires_billing": true,
1414
"default_version": "v2",
1515
"codeowner_team": "@googleapis/cdpe-cloudai",
16-
"api_shortname": "dialogflow"
16+
"api_shortname": "dialogflow",
17+
"api_description": "is an end-to-end, build-once deploy-everywhere development suite for creating conversational interfaces for websites, mobile applications, popular messaging platforms, and IoT devices. You can use it to build interfaces (such as chatbots and conversational IVR) that enable natural and rich interactions between your users and your business. Dialogflow Enterprise Edition users have access to Google Cloud Support and a service level agreement (SLA) for production deployments."
1718
}

CONTRIBUTING.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In order to add a feature:
2222
documentation.
2323

2424
- The feature must work fully on the following CPython versions:
25-
3.6, 3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
25+
3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
2626

2727
- The feature must not add unnecessary dependencies (where
2828
"unnecessary" is of course subjective, but new dependencies should
@@ -221,13 +221,11 @@ Supported Python Versions
221221

222222
We support:
223223

224-
- `Python 3.6`_
225224
- `Python 3.7`_
226225
- `Python 3.8`_
227226
- `Python 3.9`_
228227
- `Python 3.10`_
229228

230-
.. _Python 3.6: https://docs.python.org/3.6/
231229
.. _Python 3.7: https://docs.python.org/3.7/
232230
.. _Python 3.8: https://docs.python.org/3.8/
233231
.. _Python 3.9: https://docs.python.org/3.9/
@@ -239,7 +237,7 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
239237
.. _config: https://github.com/googleapis/python-dialogflow/blob/main/noxfile.py
240238

241239

242-
We also explicitly decided to support Python 3 beginning with version 3.6.
240+
We also explicitly decided to support Python 3 beginning with version 3.7.
243241
Reasons for this include:
244242

245243
- Encouraging use of newest versions of Python 3

README.rst

+66-55
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,103 @@
1-
Dialogflow: Python Client
2-
=========================
1+
Python Client for Dialogflow API
2+
================================
33

4-
|ga| |pypi| |versions|
4+
|stable| |pypi| |versions|
55

6-
Python idiomatic client for `Dialogflow ES`_
6+
`Dialogflow API`_: is an end-to-end, build-once deploy-everywhere development suite for creating conversational interfaces for websites, mobile applications, popular messaging platforms, and IoT devices. You can use it to build interfaces (such as chatbots and conversational IVR) that enable natural and rich interactions between your users and your business. Dialogflow Enterprise Edition users have access to Google Cloud Support and a service level agreement (SLA) for production deployments.
77

8-
`Dialogflow ES`_ is an enterprise-grade NLU platform that makes it easy for
9-
developers to design and integrate conversational user interfaces into
10-
mobile apps, web applications, devices, and bots.
8+
- `Client Library Documentation`_
9+
- `Product Documentation`_
1110

12-
* `Dialogflow ES Python Client API Reference <https://cloud.google.com/python/docs/reference/dialogflow/latest/index.html>`_
13-
* `Dialogflow ES Documentation <https://cloud.google.com/dialogflow/es/docs>`_
14-
15-
Read more about the client libraries for Cloud APIs, including the older
16-
Google APIs Client Libraries, in
17-
`Client Libraries Explained <https://cloud.google.com/apis/docs/client-libraries-explained>`_.
18-
19-
.. |ga| image:: https://img.shields.io/badge/support-ga-gold.svg
20-
:target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#ga-support
11+
.. |stable| image:: https://img.shields.io/badge/support-stable-gold.svg
12+
:target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#stability-levels
2113
.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dialogflow.svg
2214
:target: https://pypi.org/project/google-cloud-dialogflow/
2315
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dialogflow.svg
2416
:target: https://pypi.org/project/google-cloud-dialogflow/
25-
.. _Dialogflow ES: https://cloud.google.com/dialogflow/docs/
17+
.. _Dialogflow API: https://www.dialogflow.com/
18+
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/dialogflow/latest
19+
.. _Product Documentation: https://www.dialogflow.com/
2620

21+
Quick Start
22+
-----------
2723

28-
Before you begin
29-
----------------
24+
In order to use this library, you first need to go through the following steps:
3025

31-
#. Select or create a Cloud Platform `project`_.
32-
#. `Enable billing`_ for your project.
33-
#. `Enable the Google Cloud Dialogflow API`_.
34-
#. `Set up authentication`_ with a service account so you can access the
35-
API from your local workstation.
36-
37-
.. _project: https://console.cloud.google.com/project
38-
.. _Enable billing: https://support.google.com/cloud/answer/6293499#enable-billing
39-
.. _Enable the Google Cloud Dialogflow API: https://console.cloud.google.com/flows/enableapi?apiid=dialogflow.googleapis.com
40-
.. _Set up authentication: https://cloud.google.com/docs/authentication/getting-started
26+
1. `Select or create a Cloud Platform project.`_
27+
2. `Enable billing for your project.`_
28+
3. `Enable the Dialogflow API.`_
29+
4. `Setup Authentication.`_
4130

31+
.. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
32+
.. _Enable billing for your project.: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project
33+
.. _Enable the Dialogflow API.: https://www.dialogflow.com/
34+
.. _Setup Authentication.: https://googleapis.dev/python/google-api-core/latest/auth.html
4235

4336
Installation
44-
------------
37+
~~~~~~~~~~~~
38+
39+
Install this library in a `virtualenv`_ using pip. `virtualenv`_ is a tool to
40+
create isolated Python environments. The basic problem it addresses is one of
41+
dependencies and versions, and indirectly permissions.
4542

46-
.. code-block:: shell
43+
With `virtualenv`_, it's possible to install this library without needing system
44+
install permissions, and without clashing with the installed system
45+
dependencies.
4746

48-
pip install google-cloud-dialogflow
47+
.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/
4948

50-
.. note::
5149

52-
We highly recommend that you install this library in a
53-
`virtualenv <https://virtualenv.pypa.io/en/latest/>`_.
50+
Code samples and snippets
51+
~~~~~~~~~~~~~~~~~~~~~~~~~
52+
53+
Code samples and snippets live in the `samples/` folder.
5454

5555

5656
Supported Python Versions
5757
^^^^^^^^^^^^^^^^^^^^^^^^^
58-
Python >= 3.6
58+
Our client libraries are compatible with all current [active](https://devguide.python.org/devcycle/#in-development-main-branch) and [maintenance](https://devguide.python.org/devcycle/#maintenance-branches) versions of
59+
Python.
60+
61+
Python >= 3.7
5962

6063
Unsupported Python Versions
6164
^^^^^^^^^^^^^^^^^^^^^^^^^^^
62-
The last version of this library compatible with Python 2.7 is dialogflow==1.1.0.
63-
65+
Python <= 3.6
6466

65-
Usage
66-
-----
67+
If you are using an [end-of-life](https://devguide.python.org/devcycle/#end-of-life-branches)
68+
version of Python, we recommend that you update as soon as possible to an actively supported version.
6769

68-
View `usage documentation <https://cloud.google.com/python/docs/reference/dialogflow/latest/index.html>`_.
6970

71+
Mac/Linux
72+
^^^^^^^^^
7073

71-
Versioning
72-
----------
74+
.. code-block:: console
7375
74-
This library follows `Semantic Versioning <http://semver.org/>`_.
76+
pip install virtualenv
77+
virtualenv <your-env>
78+
source <your-env>/bin/activate
79+
<your-env>/bin/pip install google-cloud-dialogflow
7580
76-
This library is considered to be stable. This means and that the code surface will not change in backwards-incompatible
77-
ways unless either absolutely necessary (e.g. because of critical security issues) or with an extensive deprecation
78-
period. Issues and requests against GA libraries are addressed with the highest priority.
7981
80-
More Information: `Google Cloud Python Library Support <https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability>`_
82+
Windows
83+
^^^^^^^
8184

82-
Contributing
83-
------------
85+
.. code-block:: console
8486
85-
Contributions welcome! See the `Contributing Guide <https://github.com/googleapis/python-dialogflow/blob/main/.github/CONTRIBUTING.md>`_.
87+
pip install virtualenv
88+
virtualenv <your-env>
89+
<your-env>\Scripts\activate
90+
<your-env>\Scripts\pip.exe install google-cloud-dialogflow
8691
87-
License
88-
-------
92+
Next Steps
93+
~~~~~~~~~~
8994

90-
Apache Version 2.0
95+
- Read the `Client Library Documentation`_ for Dialogflow API
96+
to see other available methods on the client.
97+
- Read the `Dialogflow API Product documentation`_ to learn
98+
more about the product and see How-to Guides.
99+
- View this `README`_ to see the full list of Cloud
100+
APIs that we cover.
91101

92-
See `the LICENSE file <https://github.com/googleapis/python-dialogflow/blob/main/LICENSE>`_ for more information.
102+
.. _Dialogflow API Product documentation: https://www.dialogflow.com/
103+
.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst

0 commit comments

Comments
 (0)