From be394302f96b39b404a48673c79e3a9d43fa8bc9 Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Wed, 10 Feb 2021 22:15:08 -0500
Subject: [PATCH 1/8] Finalize tox environment

---
 setup.py |  3 ++-
 tox.ini  | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/setup.py b/setup.py
index 1dcd488..2ec9f13 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,8 @@
     packages=['spanner_orm', 'spanner_orm.admin'],
     include_package_data=True,
     python_requires='~=3.7',
-    install_requires=['google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict'],
+    install_requires=[
+      'google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict', 'protobuf'],
     tests_require=['absl-py', 'google-api-core', 'portpicker'],
     entry_points={
         'console_scripts': ['spanner-orm = spanner_orm.admin.scripts:main']
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..f257c38
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,27 @@
+# tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py36, py37, py38
+
+[testenv]
+deps =
+    absl-py
+    google-api-core
+    google-cloud-spanner >= 1.17.1
+    frozendict
+    portpicker
+allowlist_externals =
+  wget
+  tar
+  chmod
+setenv =
+  VERSION=1.2.0
+  SPANNER_EMULATOR_BINARY_PATH=/tmp/spanner_emulator/emulator_main
+commands =
+    wget https://storage.googleapis.com/cloud-spanner-emulator/releases/{env:VERSION}/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -P /tmp/spanner_emulator/
+    tar zxvf /tmp/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -C /tmp/spanner_emulator/
+    chmod u+x /tmp/spanner_emulator/gateway_main /tmp/spanner_emulator/emulator_main
+    python setup.py test
\ No newline at end of file

From a699c7ecd1a84d6c74184cc5f0cebc7f4538918a Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Wed, 10 Feb 2021 22:15:51 -0500
Subject: [PATCH 2/8] Add missing newline

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index f257c38..cf0ef5f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,4 +24,4 @@ commands =
     wget https://storage.googleapis.com/cloud-spanner-emulator/releases/{env:VERSION}/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -P /tmp/spanner_emulator/
     tar zxvf /tmp/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -C /tmp/spanner_emulator/
     chmod u+x /tmp/spanner_emulator/gateway_main /tmp/spanner_emulator/emulator_main
-    python setup.py test
\ No newline at end of file
+    python setup.py test

From 2591ea45b180d5cfc3e3e3e7057a99a52e6ba26d Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Wed, 10 Feb 2021 22:17:43 -0500
Subject: [PATCH 3/8] Make indententions consistent

---
 tox.ini | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index cf0ef5f..871517b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,11 +8,11 @@ envlist = py36, py37, py38
 
 [testenv]
 deps =
-    absl-py
-    google-api-core
-    google-cloud-spanner >= 1.17.1
-    frozendict
-    portpicker
+  absl-py
+  google-api-core
+  google-cloud-spanner >= 1.17.1
+  frozendict
+  portpicker
 allowlist_externals =
   wget
   tar

From a69b7b828c0f81a81c9b45b6260f2b9a846d7375 Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Thu, 11 Feb 2021 08:42:23 -0500
Subject: [PATCH 4/8] Revert unrelated change

---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 2ec9f13..a1b2d89 100644
--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,7 @@
     packages=['spanner_orm', 'spanner_orm.admin'],
     include_package_data=True,
     python_requires='~=3.7',
-    install_requires=[
-      'google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict', 'protobuf'],
+    install_requires=['google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict', 'protobuf'],
     tests_require=['absl-py', 'google-api-core', 'portpicker'],
     entry_points={
         'console_scripts': ['spanner-orm = spanner_orm.admin.scripts:main']

From b16cfd84bed11a3ca29da2d1f3a1842bdf0a4973 Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Thu, 11 Feb 2021 08:42:49 -0500
Subject: [PATCH 5/8] Revert unrelated change

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a1b2d89..1dcd488 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
     packages=['spanner_orm', 'spanner_orm.admin'],
     include_package_data=True,
     python_requires='~=3.7',
-    install_requires=['google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict', 'protobuf'],
+    install_requires=['google-cloud-spanner >= 1.6, <2.0.0dev', 'frozendict'],
     tests_require=['absl-py', 'google-api-core', 'portpicker'],
     entry_points={
         'console_scripts': ['spanner-orm = spanner_orm.admin.scripts:main']

From f3b9b6c9cd6de57b661a8dabbb05ee0e8fa35ebd Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Thu, 11 Feb 2021 22:26:17 -0500
Subject: [PATCH 6/8] Address PR comments

---
 .gitignore             |  1 +
 spanner_emulator/.keep |  0
 tox.ini                | 13 +++++++------
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 spanner_emulator/.keep

diff --git a/.gitignore b/.gitignore
index 0e9dea3..bf80c2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ __pycache__
 cloud-spanner-emulator*
 emulator_main
 gateway_main
+.spanner_emulator/
diff --git a/spanner_emulator/.keep b/spanner_emulator/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/tox.ini b/tox.ini
index 871517b..67f2a4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,15 +13,16 @@ deps =
   google-cloud-spanner >= 1.17.1
   frozendict
   portpicker
+  pytest
 allowlist_externals =
   wget
   tar
   chmod
 setenv =
-  VERSION=1.2.0
-  SPANNER_EMULATOR_BINARY_PATH=/tmp/spanner_emulator/emulator_main
+  SPANNER_EMULATOR_VERSION=1.2.0
+  SPANNER_EMULATOR_BINARY_PATH=.spanner_emulator/emulator_main
 commands =
-    wget https://storage.googleapis.com/cloud-spanner-emulator/releases/{env:VERSION}/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -P /tmp/spanner_emulator/
-    tar zxvf /tmp/cloud-spanner-emulator_linux_amd64-{env:VERSION}.tar.gz -C /tmp/spanner_emulator/
-    chmod u+x /tmp/spanner_emulator/gateway_main /tmp/spanner_emulator/emulator_main
-    python setup.py test
+    wget https://storage.googleapis.com/cloud-spanner-emulator/releases/{env:SPANNER_EMULATOR_VERSION}/cloud-spanner-emulator_linux_amd64-{env:SPANNER_EMULATOR_VERSION}.tar.gz -P .spanner_emulator/
+    tar zxvf .spanner_emulator/cloud-spanner-emulator_linux_amd64-{env:SPANNER_EMULATOR_VERSION}.tar.gz -C .spanner_emulator/
+    chmod u+x .spanner_emulator/gateway_main .spanner_emulator/emulator_main
+    pytest

From 7ef478ee0f1f06b32cfb5e3e358515af5d878911 Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Thu, 11 Feb 2021 22:27:49 -0500
Subject: [PATCH 7/8] Add widlcard

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bf80c2d..686d1f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ __pycache__
 cloud-spanner-emulator*
 emulator_main
 gateway_main
-.spanner_emulator/
+.spanner_emulator/**
\ No newline at end of file

From f06217f224c02ee7e8abc0b06f570fc6c30caf2e Mon Sep 17 00:00:00 2001
From: Daniel Gorelik <dgorelik@google.com>
Date: Thu, 11 Feb 2021 22:28:12 -0500
Subject: [PATCH 8/8] Add wildcard

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 686d1f1..b1a322d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ __pycache__
 cloud-spanner-emulator*
 emulator_main
 gateway_main
-.spanner_emulator/**
\ No newline at end of file
+.spanner_emulator/**