diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6ceec..df95c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Changelog -### [1.3.1](https://github.com/googleapis/python-security-private-ca/compare/v1.3.0...v1.3.1) (2022-05-05) +## [1.3.2](https://github.com/googleapis/python-security-private-ca/compare/v1.3.1...v1.3.2) (2022-06-03) + + +### Bug Fixes + +* **deps:** require protobuf <4.0.0dev ([#257](https://github.com/googleapis/python-security-private-ca/issues/257)) ([a9d08f4](https://github.com/googleapis/python-security-private-ca/commit/a9d08f41075aca6af42e0d423808c116f1d88db3)) + + +### Documentation + +* fix changelog header to consistent size ([#258](https://github.com/googleapis/python-security-private-ca/issues/258)) ([4689ab3](https://github.com/googleapis/python-security-private-ca/commit/4689ab386e34020dbe13521829a6f2f8a73ad64a)) + +## [1.3.1](https://github.com/googleapis/python-security-private-ca/compare/v1.3.0...v1.3.1) (2022-05-05) ### Documentation @@ -14,7 +26,7 @@ * Add `skip_grace_period` flag to DeleteCertificateAuthority API ([#197](https://github.com/googleapis/python-security-private-ca/issues/197)) ([3119d1a](https://github.com/googleapis/python-security-private-ca/commit/3119d1a55701ddf09d3a1351fafab731bf2b4cf1)) -### [1.2.4](https://github.com/googleapis/python-security-private-ca/compare/v1.2.3...v1.2.4) (2022-03-05) +## [1.2.4](https://github.com/googleapis/python-security-private-ca/compare/v1.2.3...v1.2.4) (2022-03-05) ### Bug Fixes @@ -22,7 +34,7 @@ * **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#192](https://github.com/googleapis/python-security-private-ca/issues/192)) ([3b4a00b](https://github.com/googleapis/python-security-private-ca/commit/3b4a00b60a35c99780e7090191553c622b353055)) * **deps:** require proto-plus>=1.15.0 ([3b4a00b](https://github.com/googleapis/python-security-private-ca/commit/3b4a00b60a35c99780e7090191553c622b353055)) -### [1.2.3](https://github.com/googleapis/python-security-private-ca/compare/v1.2.2...v1.2.3) (2022-02-26) +## [1.2.3](https://github.com/googleapis/python-security-private-ca/compare/v1.2.2...v1.2.3) (2022-02-26) ### Documentation @@ -30,7 +42,7 @@ * add generated snippets ([#180](https://github.com/googleapis/python-security-private-ca/issues/180)) ([35054f8](https://github.com/googleapis/python-security-private-ca/commit/35054f85db310ac3b0e6393557e42f40d0018995)) * **samples:** add template/monitoring samples ([#174](https://github.com/googleapis/python-security-private-ca/issues/174)) ([9fbd3e1](https://github.com/googleapis/python-security-private-ca/commit/9fbd3e11b5f5d6370ffbd1702dd18c8774dc41be)) -### [1.2.2](https://github.com/googleapis/python-security-private-ca/compare/v1.2.1...v1.2.2) (2022-02-03) +## [1.2.2](https://github.com/googleapis/python-security-private-ca/compare/v1.2.1...v1.2.2) (2022-02-03) ### Features @@ -55,7 +67,7 @@ * mark CaPool.lifetime as IMMUTABLE ([#177](https://github.com/googleapis/python-security-private-ca/issues/177)) ([259f1c9](https://github.com/googleapis/python-security-private-ca/commit/259f1c9e354b33140ff13a8ddb1b503ec810630b)) * **samples:** add sample to filter certificates ([#160](https://github.com/googleapis/python-security-private-ca/issues/160)) ([a0ae8b2](https://github.com/googleapis/python-security-private-ca/commit/a0ae8b2c9139bee84c2da645d4456b97066eff74)) -### [1.2.1](https://www.github.com/googleapis/python-security-private-ca/compare/v1.2.0...v1.2.1) (2021-11-02) +## [1.2.1](https://www.github.com/googleapis/python-security-private-ca/compare/v1.2.0...v1.2.1) (2021-11-02) ### Bug Fixes @@ -83,21 +95,21 @@ * add context manager support in client ([#131](https://www.github.com/googleapis/python-security-private-ca/issues/131)) ([eb9fc8b](https://www.github.com/googleapis/python-security-private-ca/commit/eb9fc8b1a324505418ece9636e91d844e11845de)) -### [1.0.6](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.5...v1.0.6) (2021-09-30) +## [1.0.6](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.5...v1.0.6) (2021-09-30) ### Bug Fixes * improper types in pagers generation ([f86ec89](https://www.github.com/googleapis/python-security-private-ca/commit/f86ec89f3c4537556188064606be005ee7feb056)) -### [1.0.5](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.4...v1.0.5) (2021-09-24) +## [1.0.5](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.4...v1.0.5) (2021-09-24) ### Bug Fixes * add 'dict' annotation type to 'request' ([49b5c9a](https://www.github.com/googleapis/python-security-private-ca/commit/49b5c9ae54c594abf1a8158506e2a1ddb6dce67d)) -### [1.0.4](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.3...v1.0.4) (2021-08-10) +## [1.0.4](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.3...v1.0.4) (2021-08-10) ### Documentation @@ -109,7 +121,7 @@ * release as 1.0.4 ([#100](https://www.github.com/googleapis/python-security-private-ca/issues/100)) ([47fb407](https://www.github.com/googleapis/python-security-private-ca/commit/47fb4075db02e5c3eaf4f25f3d032a6c2514afce)) -### [1.0.3](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.2...v1.0.3) (2021-07-29) +## [1.0.3](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.2...v1.0.3) (2021-07-29) ### Bug Fixes @@ -127,14 +139,14 @@ * release as 1.0.3 ([#92](https://www.github.com/googleapis/python-security-private-ca/issues/92)) ([6026929](https://www.github.com/googleapis/python-security-private-ca/commit/6026929efe36ecec40afbc442f09df609b7c42a8)) -### [1.0.2](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.1...v1.0.2) (2021-07-20) +## [1.0.2](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.1...v1.0.2) (2021-07-20) ### Bug Fixes * **deps:** pin 'google-{api,cloud}-core', 'google-auth' to allow 2.x versions ([#83](https://www.github.com/googleapis/python-security-private-ca/issues/83)) ([cd5390c](https://www.github.com/googleapis/python-security-private-ca/commit/cd5390cf5fff50419b000c71431d8ede0de35833)) -### [1.0.1](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.0...v1.0.1) (2021-07-16) +## [1.0.1](https://www.github.com/googleapis/python-security-private-ca/compare/v1.0.0...v1.0.1) (2021-07-16) ### Bug Fixes @@ -189,7 +201,7 @@ * add async client to %name_%version/init.py ([c4c8624](https://www.github.com/googleapis/python-security-private-ca/commit/c4c862426fb5b7b931dd0de4d26d1ac27ce05f1a)) * **deps:** add packaging requirement ([#56](https://www.github.com/googleapis/python-security-private-ca/issues/56)) ([5877dda](https://www.github.com/googleapis/python-security-private-ca/commit/5877dda559311e87de8f9f06f8174a0e1d4c62bc)) -### [0.1.1](https://www.github.com/googleapis/python-security-private-ca/compare/v0.1.0...v0.1.1) (2020-10-02) +## [0.1.1](https://www.github.com/googleapis/python-security-private-ca/compare/v0.1.0...v0.1.1) (2020-10-02) ### Documentation diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 6d3fbac..f3be4ba 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,3 +1,3 @@ -google-cloud-private-ca==1.3.0 +google-cloud-private-ca==1.3.1 google-cloud-kms==2.11.1 google-cloud-monitoring==2.9.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 9c90e90..2f55ed3 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ import setuptools # type: ignore -version = "1.3.1" +version = "1.3.2" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -46,7 +46,8 @@ # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", - "proto-plus >= 1.15.0", + "proto-plus >= 1.15.0, <2.0.0dev", + "protobuf >= 3.19.0, <4.0.0dev", ), python_requires=">=3.6", scripts=[ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index b666ca6..ec8ca20 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -7,3 +7,4 @@ # Then this file should have foo==1.14.0 google-api-core==1.31.5 proto-plus==1.15.0 +protobuf==3.19.0 diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index e69de29..ec8ca20 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -0,0 +1,10 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.31.5 +proto-plus==1.15.0 +protobuf==3.19.0 diff --git a/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py index 821fd87..a07d69f 100644 --- a/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py @@ -13,9 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import math import os +# try/except added for compatibility with python < 3.8 +try: + from unittest import mock + from unittest.mock import AsyncMock +except ImportError: + import mock + +import math + from google.api_core import ( future, gapic_v1, @@ -39,7 +47,6 @@ from google.type import expr_pb2 # type: ignore import grpc from grpc.experimental import aio -import mock from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest diff --git a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py index c7a7a6d..0bd531d 100644 --- a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py @@ -13,9 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import math import os +# try/except added for compatibility with python < 3.8 +try: + from unittest import mock + from unittest.mock import AsyncMock +except ImportError: + import mock + +import math + from google.api_core import ( future, gapic_v1, @@ -39,7 +47,6 @@ from google.protobuf import wrappers_pb2 # type: ignore import grpc from grpc.experimental import aio -import mock from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest