Merge branch 'master' into zuqq/avoid-copying-nodes

armadaproject · Jun 29, 2023 · 9436852 · 9436852
2 parents bd5a56f + d49082d
commit 9436852
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml
@@ -10,8 +10,8 @@ authors = [{ name = "G-Research Open Source Software", email = "armada@armadapro
 
 [project.optional-dependencies]
 format = ["black==23.3.0", "flake8==6.0.0", "pylint==2.17.4"]
-# note(JayF): sphinx-jekyll-builder was broken by sphinx-markdown-builder 0.6 -- so exclude it
-docs = ["sphinx", "sphinx-jekyll-builder", "sphinx-toolbox==3.2.0b1", "sphinx-markdown-builder<0.6"]
+# note(JayF): sphinx-jekyll-builder was broken by sphinx-markdown-builder 0.6 -- so pin to 0.5.5
+docs = ["sphinx==7.0.1", "sphinx-jekyll-builder==0.3.0", "sphinx-toolbox==3.2.0b1", "sphinx-markdown-builder==0.5.5"]
 test = ["pytest==7.3.1", "coverage>=6.5.0", "pytest-asyncio==0.21.0"]
 
 [build-system]

diff --git a/third_party/airflow/pyproject.toml b/third_party/airflow/pyproject.toml
@@ -21,8 +21,8 @@ readme = "README.md"
 [project.optional-dependencies]
 format = ["black==23.3.0", "flake8==6.0.0", "pylint==2.17.4"]
 test = ["pytest==7.3.1", "coverage>=6.5.0", "pytest-asyncio==0.21.0"]
-# note(JayF): sphinx-jekyll-builder was broken by sphinx-markdown-builder 0.6 -- so exclude it
-docs = ["sphinx", "sphinx-jekyll-builder", "sphinx-markdown-builder<0.6"]
+# note(JayF): sphinx-jekyll-builder was broken by sphinx-markdown-builder 0.6 -- so pin to 0.5.5
+docs = ["sphinx==7.0.1", "sphinx-jekyll-builder==0.3.0", "sphinx-toolbox==3.2.0b1", "sphinx-markdown-builder==0.5.5"]
 
 [build-system]
 requires = ["setuptools"]