Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only require dataclases if python<3.7 #475

Merged
merged 9 commits into from
Jun 23, 2020
Merged

fix: only require dataclases if python<3.7 #475

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdfbbc6
chore: explicitly require 3.7+
busunkim96 Jun 19, 2020
1f2a467
chore(deps): update dependency google-api-core to v1.21.0 (#473)
renovate-bot Jun 19, 2020
ef330f0
fix: keep 3.6, but tweak requirements.txt
busunkim96 Jun 19, 2020
0efc9b3
fix: restore missing extras_require
busunkim96 Jun 19, 2020
73a076c
Update requirements.txt
busunkim96 Jun 22, 2020
f574f04
Merge branch 'master' into require-3.7
busunkim96 Jun 22, 2020
e69b927
fix: add pin to install_requires too
busunkim96 Jun 22, 2020
07c6167
fix: try always using 0.6
busunkim96 Jun 22, 2020
bd190f4
fix: make dataclasses import conditional
busunkim96 Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
click==7.1.2
google-api-core==1.20.1
google-api-core==1.21.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this is showing up in the diff, but this is already 1.21.0 in master.

gapic-generator-python/requirements.txt

Line 2 in ed244b3

google-api-core==1.21.0

googleapis-common-protos==1.52.0
jinja2==2.11.2
MarkupSafe==1.1.1
protobuf==3.12.2
pypandoc==1.5
PyYAML==5.3.1
dataclasses==0.7
dataclasses==0.7; python_version < '3.7'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 0.6 instead, otherwise it will fail bazel build.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♀️ Fixed!

2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
),
extras_require={':python_version<"3.7"': ("dataclasses >= 0.4",),},
tests_require=("pyfakefs >= 3.6",),
python_requires=">=3.6",
classifiers=(
"Development Status :: 4 - Beta",
"Environment :: Console",
Expand All @@ -62,6 +63,7 @@
"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",
),
Expand Down