Commit36162a4

authored

Merge pull request#21452 from meeseeksmachine/auto-backport-of-pr-21446-on-v3.5.x

Backport PR#21446 on branch v3.5.x (Also exclude pyparsing 3.0.0 in setup.py.)

2 parents58ab868 +6d70c8b commit36162a4Copy full SHA for 36162a4

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ def make_release_tree(self, base_dir, files):`
`326`	`326`	`"numpy>=1.17",`
`327`	`327`	`"packaging>=20.0",`
`328`	`328`	`"pillow>=6.2.0",`
`329`		`-"pyparsing>=2.2.1",`
	`329`	`+"pyparsing>=2.2.1,<3.0.0",`
`330`	`330`	`"python-dateutil>=2.7",`
`331`	`331`	`]+ (`
`332`	`332`	`# Installing from a git checkout.`

Comments

(0)