Use latest sphinx for python_version >= 3.8

sergeyklay · Jun 13, 2022 · 4b8f602 · 4b8f602
1 parent a67dbc4
commit 4b8f602
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Serghei Iakovlev <[email protected]>
+# Copyright (C) 2020, 2021, 2022 Serghei Iakovlev <[email protected]>
 #
 # This file is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/requirements/requirements-dev.in b/requirements/requirements-dev.in
@@ -27,6 +27,7 @@ furo
 # freeze sphinx because flake8 requires importlib-metadata<4.3
 # for python<3.8 but sphinx>=4.4.0 requires importlib-metadata>=4.4
 sphinx>=3.5.0,<=4.3.2; python_version < '3.8'
+sphinx>=3.5.0; python_version >= '3.8'
 
 # develop
 twine

diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
@@ -130,8 +130,9 @@ snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.3.2.post1
     # via beautifulsoup4
-sphinx==5.0.1
+sphinx==5.0.1 ; python_version >= "3.8"
     # via
+    #   -r requirements/requirements-dev.in
     #   furo
     #   sphinx-basic-ng
 sphinx-basic-ng==0.0.1a11
@@ -182,7 +183,7 @@ zipp==3.8.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==62.3.4
+setuptools==62.4.0
     # via
     #   astroid
     #   check-manifest

diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Serghei Iakovlev <[email protected]>
+# Copyright (C) 2020, 2021, 2022 Serghei Iakovlev <[email protected]>
 #
 # This file is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2020, 2021 Serghei Iakovlev <[email protected]>
+# Copyright (C) 2020, 2021, 2022 Serghei Iakovlev <[email protected]>
 #
 # This file is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -175,8 +175,14 @@ def get_version_string():
         'flake8-blind-except>=0.2.0',  # Checks for blind except: statements
         'check-manifest>=0.45',  # Check MANIFEST.in
     ],
-    'docs': [
+    # freeze sphinx because flake8 requires importlib-metadata<4.3
+    # for python<3.8 but sphinx>=4.4.0 requires importlib-metadata>=4.4
+    'docs:python_version < "3.8"': [
         'furo>=2022.4.7,==2022.4.*',  # Sphinx documentation theme
+        'sphinx>=3.5.0,<=4.3.2',  # Python documentation generator
+    ],
+    'docs:python_version >= "3.8"': [
+        'furo>=2022.6.4.1,==2022.6.*',  # Sphinx documentation theme
         'sphinx>=3.5.0',  # Python documentation generator
     ],
 }
@@ -190,7 +196,9 @@ def get_version_string():
 ]
 
 EXTRAS_REQUIRE['develop'] = \
-    DEVELOP_REQUIRE + EXTRAS_REQUIRE['testing'] + EXTRAS_REQUIRE['docs']
+    DEVELOP_REQUIRE + EXTRAS_REQUIRE['testing'] + \
+    EXTRAS_REQUIRE['docs:python_version < "3.8"'] + \
+    EXTRAS_REQUIRE['docs:python_version >= "3.8"']
 
 # Project's URLs
 PROJECT_URLS = {