Skip to content

Commit a8d1c46

Browse files
authored
fix: fix install requires python_version constraint for protobuf (backport #3805) (#3821)
This is an automatic backport of pull request #3805 done by [Mergify](https://mergify.com). Cherry-pick of 9d76e3b has failed: ``` On branch mergify/bp/1.2/pr-3805 Your branch is up to date with 'origin/1.2'. You are currently cherry-picking commit 9d76e3b. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: setup.py no changes added to commit (use "git add" and/or "git commit -a") ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>
1 parent 6aed4ec commit a8d1c46

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def get_exts_for(name):
241241
"typing; python_version<'3.5'",
242242
"packaging>=17.1",
243243
"protobuf>=3; python_version>='3.7'",
244-
"protobuf>=3,<4.0; python_version<'3.7'",
244+
"protobuf>=3,<4.0; python_version=='3.6'",
245245
"protobuf>=3,<3.18; python_version<'3.6'",
246246
"tenacity>=5",
247247
"attrs>=19.2.0",

0 commit comments

Comments
 (0)