From 39d10c3e0dea7a4ce021aa897c1cf784a1725f11 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:24:27 -0700 Subject: [PATCH 01/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 72fa5653..56283eb0 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner>=3.12.0", + "https://github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner", "alembic", ] extras = { From a5e67b7a413f9617b6f4c95de6a4d64a94d0c31d Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:26:48 -0700 Subject: [PATCH 02/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 56283eb0..c431d4fa 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,6 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "https://github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner", "alembic", ] extras = { @@ -71,6 +70,7 @@ ] }, install_requires=dependencies, + dependency_links = ["https://github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner"], extras_require=extras, name=name, namespace_packages=namespaces, From a4dd7aca27f16582c9b4ea26ffe710a053cf7e4c Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:30:05 -0700 Subject: [PATCH 03/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c431d4fa..8833e7a2 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ ] }, install_requires=dependencies, - dependency_links = ["https://github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner"], + dependency_links = ["git+ssh://git@github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner"], extras_require=extras, name=name, namespace_packages=namespaces, From 097da85068aa56ecff65d00d724ce9bf7c7e3644 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:37:46 -0700 Subject: [PATCH 04/13] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 8833e7a2..0d283ea0 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", + "google-cloud-spanner", "alembic", ] extras = { From e0d4fa3e82debff63da50c41209211e955905842 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:41:33 -0700 Subject: [PATCH 05/13] Update setup.py --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0d283ea0..6a983238 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner", + "google-cloud-spanner @ git+ssh://git@github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner" "alembic", ] extras = { @@ -71,7 +71,6 @@ ] }, install_requires=dependencies, - dependency_links = ["git+ssh://git@github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner"], extras_require=extras, name=name, namespace_packages=namespaces, From 8c9bc0eb8637b652986e0b8c8422a8976a86aba1 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:48:55 -0700 Subject: [PATCH 06/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6a983238..963696ec 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner @ git+ssh://git@github.com/c2nes/python-spanner/tarball/dml-returning#egg=google-cloud-spanner" + "google-cloud-spanner @ git+ssh://git@github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner" "alembic", ] extras = { From da60c94162a2735e4eb5f18f8701da5b1c514f4b Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:51:10 -0700 Subject: [PATCH 07/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 963696ec..09eeddfa 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner @ git+ssh://git@github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner" + "google-cloud-spanner @ git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner" "alembic", ] extras = { From c338732da7cdaba5cfc3ab1424d109c3c32b061a Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:54:21 -0700 Subject: [PATCH 08/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 09eeddfa..7109e395 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner @ git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner" + "google-cloud-spanner @ git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner", "alembic", ] extras = { From 5dbfb83af114458e0103f803822724a994e3b645 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Wed, 21 Sep 2022 23:58:26 -0700 Subject: [PATCH 09/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7109e395..a21749f5 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "google-cloud-spanner @ git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner", + "git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner", "alembic", ] extras = { From ca64d9aab12929ac9864366b9a7ed237dcafaf3c Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Thu, 22 Sep 2022 00:27:50 -0700 Subject: [PATCH 10/13] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 693754b6..4aaabe87 100644 --- a/noxfile.py +++ b/noxfile.py @@ -147,7 +147,7 @@ def compliance_test_13(session): ) session.install("mock") - session.install("-e", ".[tracing]") + session.install("-e", ".[tracing]", "-v") session.run("pip", "install", "sqlalchemy>=1.1.13,<=1.3.24", "--force-reinstall") session.run("pip", "install", "pytest==6.2.2", "--force-reinstall") session.run("pip", "install", "opentelemetry-api<=1.10", "--force-reinstall") From 801b477ee672141cdffecaa96faa8e605c3491bb Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Thu, 22 Sep 2022 00:29:58 -0700 Subject: [PATCH 11/13] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 4aaabe87..420f5772 100644 --- a/noxfile.py +++ b/noxfile.py @@ -147,7 +147,7 @@ def compliance_test_13(session): ) session.install("mock") - session.install("-e", ".[tracing]", "-v") + session.install("-e", "-v", ".[tracing]") session.run("pip", "install", "sqlalchemy>=1.1.13,<=1.3.24", "--force-reinstall") session.run("pip", "install", "pytest==6.2.2", "--force-reinstall") session.run("pip", "install", "opentelemetry-api<=1.10", "--force-reinstall") From ad0f702e5cade17bb2b5f25ac83fb4a8d7d203d7 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Thu, 22 Sep 2022 00:31:16 -0700 Subject: [PATCH 12/13] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 420f5772..693754b6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -147,7 +147,7 @@ def compliance_test_13(session): ) session.install("mock") - session.install("-e", "-v", ".[tracing]") + session.install("-e", ".[tracing]") session.run("pip", "install", "sqlalchemy>=1.1.13,<=1.3.24", "--force-reinstall") session.run("pip", "install", "pytest==6.2.2", "--force-reinstall") session.run("pip", "install", "opentelemetry-api<=1.10", "--force-reinstall") From 6537324a78cc36023b71610c783ac3966c939fe7 Mon Sep 17 00:00:00 2001 From: Ilya Gurov Date: Thu, 22 Sep 2022 00:32:09 -0700 Subject: [PATCH 13/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a21749f5..7109e395 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ description = "SQLAlchemy dialect integrated into Cloud Spanner database" dependencies = [ "sqlalchemy>=1.1.13", - "git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner", + "google-cloud-spanner @ git+https://github.com/c2nes/python-spanner.git@dml-returning#egg=google-cloud-spanner", "alembic", ] extras = {