[airflow] 19/33: Unpin ``cattrs`` (#20872)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v2-2-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 88b4b86661d78befb25776be9938ff00c9757296
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Fri Jan 14 20:29:29 2022 +0530

    Unpin ``cattrs`` (#20872)
    
    This was pinned because of issue mentioned in https://github.com/apache/airflow/issues/16172 . However this was fixed in 1.8.0 of cattrs by https://github.com/python-attrs/cattrs/issues/151
    
    Changelog entry - https://cattrs.readthedocs.io/en/latest/history.html#id9
    
    (cherry picked from commit 88814587d451be7493e005e4d477609a39caa1d9)
---
 setup.cfg | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 23544e5..328ba95 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,6 +46,7 @@ license_files =
    licenses/LICENSE-moment.txt
    licenses/LICENSE-normalize.txt
 # End of licences generated automatically
+   licenses/LICENSES-ui.txt
 classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Console
@@ -87,8 +88,7 @@ install_requires =
     cached_property~=1.5;python_version<="3.7"
     # cattrs >= 1.1.0 dropped support for Python 3.6
     cattrs>=1.0, <1.1.0;python_version<="3.6"
-    # cattrs >= 1.7.0 break lineage - see https://github.com/apache/airflow/issues/16172
-    cattrs~=1.1, <1.7.0;python_version>"3.6"
+    cattrs~=1.1, !=1.7.*;python_version>"3.6"
     # Required by vendored-in connexion
     clickclick>=1.2
     colorlog>=4.0.2, <6.0
@@ -109,8 +109,7 @@ install_requires =
     flask-wtf>=0.14.3, <0.15
     graphviz>=0.12
     gunicorn>=20.1.0
-    # We need to limit httpx until https://github.com/apache/airflow/issues/20088 is fixed
-    httpx<0.20.0
+    httpx
     importlib_metadata>=1.7;python_version<"3.9"
     importlib_resources~=5.2;python_version<"3.9"
     # Required by vendored-in connexion
@@ -118,7 +117,10 @@ install_requires =
     iso8601>=0.1.12
     # Logging is broken with itsdangerous > 2
     itsdangerous>=1.1.0, <2.0
-    jinja2>=2.10.1,<4
+    # Jinja2 3.1 will remove the 'autoescape' and 'with' extensions, which would
+    # break Flask 1.x, so we limit this for future compatibility. Remove this
+    # when bumping Flask to >=2.
+    jinja2>=2.10.1,<3.1
     jsonschema~=3.0
     lazy-object-proxy
     lockfile>=0.12.2