From 3211cd0f3c6185dabc5ff3defd05520b68034175 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Fri, 15 May 2020 13:13:10 +1000 Subject: [PATCH 01/13] feat: add PyPI release support From 2d00f17bf493054659310505d8c0a03d684b4de0 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 10:15:11 +1000 Subject: [PATCH 02/13] fix: update package name Fixes #455 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2e7e7ca58a..4ac56be2bb 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ] setup( - name='django-spanner', + name='django-google-spanner', # Duplicate version here rather than using # __import__('django_spanner').__version__ because that file imports # django and google.cloud which may not be installed. From d2edb9bcbcee1bee9d62b9047f4bcedc6b5a8a24 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 10:21:45 +1000 Subject: [PATCH 03/13] deps: remove dependency on google-cloud --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 4ac56be2bb..81c709cc60 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,6 @@ install_requires = [ 'sqlparse >= 0.3.0', - 'google-cloud >= 0.34.0', 'google-cloud-spanner >= 1.8.0', ] From 47da129dea9f7fd878fbaf0fce723b6824946071 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 14:40:09 +1000 Subject: [PATCH 04/13] chore: added extra fields to setup.py --- setup.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup.py b/setup.py index 81c709cc60..f8048a482f 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,12 @@ version = '2.2a0' +package_root = os.path.abspath(os.path.dirname(__file__)) + +readme_filename = os.path.join(package_root, "README.rst") +with io.open(readme_filename, encoding="utf-8") as readme_file: + readme = readme_file.read() + install_requires = [ 'sqlparse >= 0.3.0', 'google-cloud-spanner >= 1.8.0', @@ -22,9 +28,11 @@ author='Google LLC', author_email='cloud-spanner-developers@googlegroups.com', description=('Bridge to enable using Django with Spanner.'), + long_description=readme, license='BSD', packages=find_packages(exclude=['tests']), install_requires=install_requires, + url="https://github.com/googleapis/python-spanner-django", classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Web Environment', @@ -39,4 +47,5 @@ 'Framework :: Django', 'Framework :: Django :: 2.2', ], + python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*", ) From ce6533ec069b6cf20335e2c35d52a89907e757e8 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 14:45:59 +1000 Subject: [PATCH 05/13] fix: single-source the version --- django_spanner/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_spanner/__init__.py b/django_spanner/__init__.py index b329da70db..83dd31bbf2 100644 --- a/django_spanner/__init__.py +++ b/django_spanner/__init__.py @@ -18,7 +18,7 @@ from .lookups import register_lookups from .utils import check_django_compatability -__version__ = '2.2a0' +__version__ = pkg_resources.get_distribution("django-google-spanner").version check_django_compatability() register_expressions() From a0aba52476ed9038f21ea29380acb85776d6291e Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 14:53:43 +1000 Subject: [PATCH 06/13] fix: made setup.py consistent with client lib --- setup.py | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index f8048a482f..cbe941b723 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,25 @@ from setuptools import find_packages, setup -version = '2.2a0' + +# Package metadata. + +name = "django-google-spanner" +description = "Bridge to enable using Django with Spanner." +version = "2.2a0" +# Should be one of: +# 'Development Status :: 3 - Alpha' +# 'Development Status :: 4 - Beta' +# 'Development Status :: 5 - Production/Stable' +release_status = "Development Status :: 3 - Alpha" +dependencies = [ + 'sqlparse >= 0.3.0', + 'google-cloud-spanner >= 1.8.0', +] +extras = {} + + +# Setup boilerplate below this line. package_root = os.path.abspath(os.path.dirname(__file__)) @@ -14,27 +32,23 @@ with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() -install_requires = [ - 'sqlparse >= 0.3.0', - 'google-cloud-spanner >= 1.8.0', -] setup( - name='django-google-spanner', + name=name, # Duplicate version here rather than using # __import__('django_spanner').__version__ because that file imports # django and google.cloud which may not be installed. version=version, + description=description, + long_description=readme, author='Google LLC', author_email='cloud-spanner-developers@googlegroups.com', - description=('Bridge to enable using Django with Spanner.'), - long_description=readme, license='BSD', packages=find_packages(exclude=['tests']), - install_requires=install_requires, + install_requires=dependencies, url="https://github.com/googleapis/python-spanner-django", classifiers=[ - 'Development Status :: 4 - Beta', + release_status, 'Environment :: Web Environment', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD', @@ -47,5 +61,6 @@ 'Framework :: Django', 'Framework :: Django :: 2.2', ], + extras_require=extras, python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*", ) From c8c61ce99e2f27c2f1856b37b6f0114f7ebe34a9 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 19 May 2020 14:54:43 +1000 Subject: [PATCH 07/13] fix: removed comment that no longer applies --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index cbe941b723..c86322b730 100644 --- a/setup.py +++ b/setup.py @@ -35,9 +35,6 @@ setup( name=name, - # Duplicate version here rather than using - # __import__('django_spanner').__version__ because that file imports - # django and google.cloud which may not be installed. version=version, description=description, long_description=readme, From 251ee4a0553b9373440099143ca370f6b2c50d5a Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Wed, 20 May 2020 12:06:10 +1000 Subject: [PATCH 08/13] fix: only support python version >=3.5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c86322b730..48cbfc0568 100644 --- a/setup.py +++ b/setup.py @@ -59,5 +59,5 @@ 'Framework :: Django :: 2.2', ], extras_require=extras, - python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*", + python_requires=">=3.5", ) From 8514f00d47fba2b0204f61661fd5e73ad663f061 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 26 May 2020 10:57:15 +1000 Subject: [PATCH 09/13] add missing os import --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 48cbfc0568..596532e88d 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,9 @@ # license that can be found in the LICENSE file or at # https://developers.google.com/open-source/licenses/bsd -from setuptools import find_packages, setup +import os +from setuptools import find_packages, setup # Package metadata. From 596c107bd0611c3befead81cd56fcba4a7aa8aad Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 26 May 2020 11:12:49 +1000 Subject: [PATCH 10/13] add missing io import --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 596532e88d..d5515b05d5 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ # license that can be found in the LICENSE file or at # https://developers.google.com/open-source/licenses/bsd +import io import os from setuptools import find_packages, setup From a11164ebed344d8f277f76a4011a6354ddb83103 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 26 May 2020 11:19:39 +1000 Subject: [PATCH 11/13] fix README file extension --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d5515b05d5..e82752e4c4 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ package_root = os.path.abspath(os.path.dirname(__file__)) -readme_filename = os.path.join(package_root, "README.rst") +readme_filename = os.path.join(package_root, "README.md") with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() From 61b48cfe53185e6db24877b946c93decc3a6a224 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 26 May 2020 11:29:20 +1000 Subject: [PATCH 12/13] add missing pkg_resources import --- django_spanner/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django_spanner/__init__.py b/django_spanner/__init__.py index 83dd31bbf2..24e9e21bc7 100644 --- a/django_spanner/__init__.py +++ b/django_spanner/__init__.py @@ -5,6 +5,8 @@ # https://developers.google.com/open-source/licenses/bsd import datetime +import pkg_resources + # Monkey-patch AutoField to generate a random value since Cloud Spanner can't # do that. from uuid import uuid4 From 2cecc5c2c4696e251961c731998cbf5a6289d44f Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 26 May 2020 12:13:53 +1000 Subject: [PATCH 13/13] fix import ordering --- django_spanner/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/django_spanner/__init__.py b/django_spanner/__init__.py index 24e9e21bc7..b08f08f460 100644 --- a/django_spanner/__init__.py +++ b/django_spanner/__init__.py @@ -5,12 +5,11 @@ # https://developers.google.com/open-source/licenses/bsd import datetime -import pkg_resources - # Monkey-patch AutoField to generate a random value since Cloud Spanner can't # do that. from uuid import uuid4 +import pkg_resources from django.db.models.fields import AutoField, Field # Monkey-patch google.DatetimeWithNanoseconds's __eq__ compare against datetime.datetime. from google.api_core.datetime_helpers import DatetimeWithNanoseconds