Merge branch '2.0.x'

CHANGES.rst

@@ -115,6 +115,15 @@ Released 2021-05-11
 -   Add type hinting. :pr:`3973`.
 
 
+Version 1.1.4
+-------------
+
+Released 2021-05-13
+
+-   Update ``static_folder`` to use ``_compat.fspath`` instead of
+    ``os.fspath`` to continue supporting Python < 3.6 :issue:`4050`
+
+
 Version 1.1.3
 -------------
 

tests/test_basic.py

@@ -1448,7 +1448,6 @@ def test_static_url_empty_path_default(app):
     rv.close()
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires Python >= 3.6")
 def test_static_folder_with_pathlib_path(app):
     from pathlib import Path