From 59fc9645c5a8f2d58b0da0ecbe2b497a6a6c1aac Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Apr 27 2022 05:50:57 +0000 Subject: Fix dependencies used by tox and sphinx Pins Python libraries to same versions as in Fedora 34. --- diff --git a/docs/Makefile b/docs/Makefile index 5ab29b5..73e70dd 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -W -SPHINXBUILD = sphinx-build-3 +SPHINXBUILD = sphinx-build SPHINXPROJ = WaiverDB SOURCEDIR = . BUILDDIR = _build diff --git a/docs/conf.py b/docs/conf.py index fc0ba42..6e6e868 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -95,7 +95,7 @@ language = None # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'venv', '.venv'] # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' diff --git a/docs/requirements.txt b/docs/requirements.txt index 09d386c..62c8dd2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,10 +3,17 @@ Flask flask-cors Flask-Migrate Flask-RESTful!=0.3.6 -flask-oidc -stomp.py -sphinx < 4 -sphinxcontrib-httpdomain +gssapi prometheus_client dogpile.cache PyYAML + +stomp.py==6.1.0 +cryptography==3.4.6 + +flask-oidc==1.4.0 +itsdangerous==1.1.0 + +sphinx +sphinxcontrib-httpdomain +markupsafe==1.1.1 diff --git a/requirements.txt b/requirements.txt index de5c8ef..8207899 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,13 +8,18 @@ Flask-SQLAlchemy flask-cors SQLAlchemy gssapi -flask-oidc Flask-Migrate -stomp.py + +stomp.py==6.1.0 +cryptography==3.4.6 + +flask-oidc==1.4.0 +itsdangerous==1.1.0 # Documentation requirements sphinx sphinxcontrib-httpdomain +markupsafe==1.1.1 # CLI click diff --git a/tox.ini b/tox.ini index 63a9eb0..f4f9532 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] -envlist = lint,py38,docs +envlist = lint,py39,docs # If the user is missing an interpreter, don't fail skip_missing_interpreters = True [testenv] +basepython = python3.9 deps = -rrequirements.txt -rtest-requirements.txt