Fix installing brotli extra on Python 2.7

illia-v · sethmlarson · web-flow · commit e63989f97d20 · 2023-10-02T08:52:01.000-05:00
Co-authored-by: Seth Michael Larson &lt;sethmichaellarson@gmail.com&gt;
diff --git a/setup.py b/setup.py
@@ -85,7 +85,9 @@
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
     extras_require={
         "brotli": [
-            "brotli>=1.0.9; (os_name != 'nt' or python_version >= '3') and platform_python_implementation == 'CPython'",
+            # https://github.com/google/brotli/issues/1074
+            "brotli==1.0.9; os_name != 'nt' and python_version < '3' and platform_python_implementation == 'CPython'",
+            "brotli>=1.0.9; python_version >= '3' and platform_python_implementation == 'CPython'",
             "brotlicffi>=0.8.0; (os_name != 'nt' or python_version >= '3') and platform_python_implementation != 'CPython'",
             "brotlipy>=0.6.0; os_name == 'nt' and python_version < '3'",
         ],

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@`
`85`	`85`	`python_requires=">=2.7, !=3.0., !=3.1., !=3.2., !=3.3., !=3.4., !=3.5.",`
`86`	`86`	`extras_require={`
`87`	`87`	`"brotli": [`
`88`		`- "brotli>=1.0.9; (os_name != 'nt' or python_version >= '3') and platform_python_implementation == 'CPython'",`
	`88`	`+ # https://github.com/google/brotli/issues/1074`
	`89`	`+ "brotli==1.0.9; os_name != 'nt' and python_version < '3' and platform_python_implementation == 'CPython'",`
	`90`	`+ "brotli>=1.0.9; python_version >= '3' and platform_python_implementation == 'CPython'",`
`89`	`91`	`"brotlicffi>=0.8.0; (os_name != 'nt' or python_version >= '3') and platform_python_implementation != 'CPython'",`
`90`	`92`	`"brotlipy>=0.6.0; os_name == 'nt' and python_version < '3'",`
`91`	`93`	`],`