From 52339f70340eb8f497c816f36f71c8232928e57b Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 4 Mar 2022 11:29:02 -0500 Subject: [PATCH 1/5] fix(deps): require google-api-core>=1.31.5, >=2.3.2 (#419) --- setup.py | 2 +- testing/constraints-3.6.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0189da96..31840e81 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ def readme(): ], platforms="Posix; MacOS X; Windows", install_requires=[ - "google-api-core>=1.30.0", # Work-around bug in cloud core deps. + "google-api-core >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", # NOTE: Maintainers, please do not require google-auth>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 60421130..f65bd213 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -7,4 +7,4 @@ sqlalchemy==1.2.0 google-auth==1.25.0 google-cloud-bigquery==2.25.2 -google-api-core==1.30.0 +google-api-core==1.31.5 From 728abd9591346c37c2f697158e2006ab0bae63d2 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 4 Mar 2022 14:02:31 -0500 Subject: [PATCH 2/5] chore: Adding support for pytest-xdist and pytest-parallel (#420) Source-Link: https://github.com/googleapis/synthtool/commit/82f5cb283efffe96e1b6cd634738e0e7de2cd90a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:5d8da01438ece4021d135433f2cf3227aa39ef0eaccc941d62aa35e6902832ae Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .github/.OwlBot.lock.yaml | 3 +- samples/snippets/noxfile.py | 78 +++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b668c04d..7e08e05a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:ed1f9983d5a935a89fe8085e8bb97d94e41015252c5b6c9771257cf8624367e6 - + digest: sha256:5d8da01438ece4021d135433f2cf3227aa39ef0eaccc941d62aa35e6902832ae diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 20cdfc62..85f5836d 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -188,42 +188,52 @@ def _session_tests( # check for presence of tests test_list = glob.glob("*_test.py") + glob.glob("test_*.py") test_list.extend(glob.glob("tests")) + if len(test_list) == 0: print("No tests found, skipping directory.") - else: - if TEST_CONFIG["pip_version_override"]: - pip_version = TEST_CONFIG["pip_version_override"] - session.install(f"pip=={pip_version}") - """Runs py.test for a particular project.""" - if os.path.exists("requirements.txt"): - if os.path.exists("constraints.txt"): - session.install("-r", "requirements.txt", "-c", "constraints.txt") - else: - session.install("-r", "requirements.txt") - - if os.path.exists("requirements-test.txt"): - if os.path.exists("constraints-test.txt"): - session.install( - "-r", "requirements-test.txt", "-c", "constraints-test.txt" - ) - else: - session.install("-r", "requirements-test.txt") - - if INSTALL_LIBRARY_FROM_SOURCE: - session.install("-e", _get_repo_root()) - - if post_install: - post_install(session) - - session.run( - "pytest", - *(PYTEST_COMMON_ARGS + session.posargs), - # Pytest will return 5 when no tests are collected. This can happen - # on travis where slow and flaky tests are excluded. - # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html - success_codes=[0, 5], - env=get_pytest_env_vars(), - ) + return + + if TEST_CONFIG["pip_version_override"]: + pip_version = TEST_CONFIG["pip_version_override"] + session.install(f"pip=={pip_version}") + """Runs py.test for a particular project.""" + concurrent_args = [] + if os.path.exists("requirements.txt"): + if os.path.exists("constraints.txt"): + session.install("-r", "requirements.txt", "-c", "constraints.txt") + else: + session.install("-r", "requirements.txt") + with open("requirements.txt") as rfile: + packages = rfile.read() + + if os.path.exists("requirements-test.txt"): + if os.path.exists("constraints-test.txt"): + session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt") + else: + session.install("-r", "requirements-test.txt") + with open("requirements-test.txt") as rtfile: + packages += rtfile.read() + + if INSTALL_LIBRARY_FROM_SOURCE: + session.install("-e", _get_repo_root()) + + if post_install: + post_install(session) + + if "pytest-parallel" in packages: + concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"]) + elif "pytest-xdist" in packages: + concurrent_args.extend(["-n", "auto"]) + + session.run( + "pytest", + *(PYTEST_COMMON_ARGS + session.posargs + concurrent_args), + # Pytest will return 5 when no tests are collected. This can happen + # on travis where slow and flaky tests are excluded. + # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html + success_codes=[0, 5], + env=get_pytest_env_vars(), + ) @nox.session(python=ALL_VERSIONS) From 3854f2f794a61cd57be31a1923bf49a0a31d49ef Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 5 Mar 2022 18:13:52 +0100 Subject: [PATCH 3/5] chore(deps): update all dependencies (#402) * chore(deps): update all dependencies * revert change * limit max supported version for sqlalchemy to 1.4.27 * revert change * revert change * fix typo * fix typo Co-authored-by: Anthonios Partheniou --- dev_requirements.txt | 2 +- samples/snippets/requirements-test.txt | 8 +++--- samples/snippets/requirements.txt | 36 +++++++++++++------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index e4a6a867..933bd8fd 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -3,5 +3,5 @@ google-cloud-bigquery>=1.6.0 future==0.18.2 pytest==6.2.5 -pytest-flake8==1.0.7 +pytest-flake8==1.1.0 pytz==2021.3 \ No newline at end of file diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt index 426fb5ff..4055c210 100644 --- a/samples/snippets/requirements-test.txt +++ b/samples/snippets/requirements-test.txt @@ -1,6 +1,6 @@ attrs==21.4.0 -click==8.0.3 -google-auth==2.3.3 +click==8.0.4 +google-auth==2.6.0 google-cloud-testutils==1.3.1 iniconfig==1.1.1 packaging==21.3 @@ -8,9 +8,9 @@ pluggy==1.0.0 py==1.11.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pyparsing==3.0.6 +pyparsing==3.0.7 pytest==6.2.5 rsa==4.8 six==1.16.0 toml==0.10.2 -typing-extensions==4.0.1 +typing-extensions==4.1.1 diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index b7670ad6..251f0c77 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,34 +1,34 @@ -alembic==1.7.5 +alembic==1.7.6 certifi==2021.10.8 -charset-normalizer==2.0.10 +charset-normalizer==2.0.12 future==0.18.2 -geoalchemy2==0.10.2 -google-api-core[grpc]==2.4.0 -google-auth==2.3.3 -google-cloud-bigquery==2.32.0 -google-cloud-core==2.2.1 +geoalchemy2==0.11.0 +google-api-core[grpc]==2.6.0 +google-auth==2.6.0 +google-cloud-bigquery==2.34.1 +google-cloud-core==2.2.2 google-crc32c==1.3.0 -google-resumable-media==2.1.0 -googleapis-common-protos==1.54.0 +google-resumable-media==2.3.1 +googleapis-common-protos==1.55.0 greenlet==1.1.2 -grpcio==1.43.0 -grpcio-status==1.43.0 +grpcio==1.44.0 +grpcio-status==1.44.0 idna==3.3 importlib-resources==5.4.0 mako==1.1.6 -markupsafe==2.0.1 +markupsafe==2.1.0 packaging==21.3 -proto-plus==1.19.8 -protobuf==3.19.3 +proto-plus==1.20.3 +protobuf==3.19.4 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pyparsing==3.0.6 +pyparsing==3.0.7 python-dateutil==2.8.2 pytz==2021.3 requests==2.27.1 rsa==4.8 -shapely==1.8.0 +shapely==1.8.1.post1 six==1.16.0 -sqlalchemy==1.4.26 -typing-extensions==4.0.1 +sqlalchemy==1.4.27 +typing-extensions==4.1.1 urllib3==1.26.8 From b2c369e47cfdf002dab5b5ba24c06119a466cb04 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 7 Mar 2022 18:30:55 +0100 Subject: [PATCH 4/5] chore(deps): update all dependencies (#422) * chore(deps): update all dependencies * revert * revert * revert * revert Co-authored-by: Anthonios Partheniou --- samples/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 251f0c77..b66a8135 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -2,7 +2,7 @@ alembic==1.7.6 certifi==2021.10.8 charset-normalizer==2.0.12 future==0.18.2 -geoalchemy2==0.11.0 +geoalchemy2==0.11.1 google-api-core[grpc]==2.6.0 google-auth==2.6.0 google-cloud-bigquery==2.34.1 From 7f751ddb9a0d3c4201cba02ee78df69793c5b5ed Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 13:01:17 -0600 Subject: [PATCH 5/5] chore(main): release 1.4.1 (#421) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ sqlalchemy_bigquery/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc3c303..d8e095bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,13 @@ Older versions of this project were distributed as [pybigquery][0]. [2]: https://pypi.org/project/pybigquery/#history +### [1.4.1](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.4.0...v1.4.1) (2022-03-07) + + +### Bug Fixes + +* **deps:** require google-api-core>=1.31.5, >=2.3.2 ([#419](https://github.com/googleapis/python-bigquery-sqlalchemy/issues/419)) ([52339f7](https://github.com/googleapis/python-bigquery-sqlalchemy/commit/52339f70340eb8f497c816f36f71c8232928e57b)) + ## [1.4.0](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.3.0...v1.4.0) (2022-02-22) diff --git a/sqlalchemy_bigquery/version.py b/sqlalchemy_bigquery/version.py index ff024258..0b8f4279 100644 --- a/sqlalchemy_bigquery/version.py +++ b/sqlalchemy_bigquery/version.py @@ -17,4 +17,4 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__version__ = "1.4.0" +__version__ = "1.4.1"