From cdfbbc604890b1bd508428044011f1b0189caffa Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 19 Jun 2020 21:39:03 +0000 Subject: [PATCH 1/8] chore: explicitly require 3.7+ --- requirements.txt | 3 +-- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8adddf856d..0efeb4566a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,4 @@ jinja2==2.11.2 MarkupSafe==1.1.1 protobuf==3.12.2 pypandoc==1.5 -PyYAML==5.3.1 -dataclasses==0.7 \ No newline at end of file +PyYAML==5.3.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 262edf4831..3a0bbc55a4 100644 --- a/setup.py +++ b/setup.py @@ -52,16 +52,16 @@ "pypandoc >= 1.4", "PyYAML >= 5.1.1", ), - extras_require={':python_version<"3.7"': ("dataclasses >= 0.4",),}, tests_require=("pyfakefs >= 3.6",), + python_requires=">=3.7", classifiers=( "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Topic :: Software Development :: Code Generators", "Topic :: Software Development :: Libraries :: Python Modules", ), From 1f2a467660899a3f98ed8cf8c47823a764c8ba1e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Jun 2020 22:22:50 +0200 Subject: [PATCH 2/8] chore(deps): update dependency google-api-core to v1.21.0 (#473) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0efeb4566a..8d30ccb4d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ click==7.1.2 -google-api-core==1.20.1 +google-api-core==1.21.0 googleapis-common-protos==1.52.0 jinja2==2.11.2 MarkupSafe==1.1.1 From ef330f02afab6163727ef1763e11848cbd451385 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 19 Jun 2020 22:05:19 +0000 Subject: [PATCH 3/8] fix: keep 3.6, but tweak requirements.txt --- requirements.txt | 3 ++- setup.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8d30ccb4d8..5b28753eb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,5 @@ jinja2==2.11.2 MarkupSafe==1.1.1 protobuf==3.12.2 pypandoc==1.5 -PyYAML==5.3.1 \ No newline at end of file +PyYAML==5.3.1 +dataclasses==0.7; python_version < '3.7' \ No newline at end of file diff --git a/setup.py b/setup.py index 3a0bbc55a4..3ab141cd17 100644 --- a/setup.py +++ b/setup.py @@ -53,13 +53,14 @@ "PyYAML >= 5.1.1", ), tests_require=("pyfakefs >= 3.6",), - python_requires=">=3.7", + python_requires=">=3.6", classifiers=( "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX", + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Topic :: Software Development :: Code Generators", From 0efc9b308b5ee2a02bfdbfa16139b0ece76bd7cf Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 19 Jun 2020 22:07:23 +0000 Subject: [PATCH 4/8] fix: restore missing extras_require --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 3ab141cd17..c65c63cf93 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,7 @@ "pypandoc >= 1.4", "PyYAML >= 5.1.1", ), + extras_require={':python_version<"3.7"': ("dataclasses >= 0.4",),}, tests_require=("pyfakefs >= 3.6",), python_requires=">=3.6", classifiers=( From 73a076c42fdef93586390f5ece4392ef7121c479 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Mon, 22 Jun 2020 10:56:05 -0700 Subject: [PATCH 5/8] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5b28753eb6..5ba300c78b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ MarkupSafe==1.1.1 protobuf==3.12.2 pypandoc==1.5 PyYAML==5.3.1 -dataclasses==0.7; python_version < '3.7' \ No newline at end of file +dataclasses==0.6; python_version < '3.7' From e69b927e7f5f800f873b8f41558d4cbd4d8f825b Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Mon, 22 Jun 2020 22:06:55 +0000 Subject: [PATCH 6/8] fix: add pin to install_requires too --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c65c63cf93..ba38e947e5 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,7 @@ "protobuf >= 3.12.0", "pypandoc >= 1.4", "PyYAML >= 5.1.1", + "dataclasses < 0.7; python_version < '3.7'" ), extras_require={':python_version<"3.7"': ("dataclasses >= 0.4",),}, tests_require=("pyfakefs >= 3.6",), From 07c6167333f789834d9825944fff22393ea9448c Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Mon, 22 Jun 2020 22:10:02 +0000 Subject: [PATCH 7/8] fix: try always using 0.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5ba300c78b..c5b4b5456e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ MarkupSafe==1.1.1 protobuf==3.12.2 pypandoc==1.5 PyYAML==5.3.1 -dataclasses==0.6; python_version < '3.7' +dataclasses==0.6 From bd190f4d4190a2f6d9ba4e3e641c78080a384246 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Tue, 23 Jun 2020 00:53:36 +0000 Subject: [PATCH 8/8] fix: make dataclasses import conditional --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5b4b5456e..5ba300c78b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ MarkupSafe==1.1.1 protobuf==3.12.2 pypandoc==1.5 PyYAML==5.3.1 -dataclasses==0.6 +dataclasses==0.6; python_version < '3.7'