From 0264351abc7962a5c3438b6f54f004e84616fe70 Mon Sep 17 00:00:00 2001 From: derekpierre Date: Tue, 7 Apr 2020 10:16:02 -0400 Subject: [PATCH] Enable docs to build with latest version of sphinx. Recomoonmark needed to be specified differently in the configuration --- Pipfile | 2 +- Pipfile.lock | 94 ++++++++++++++++++++++---------------------- dev-requirements.txt | 8 ++-- docs/source/conf.py | 6 +-- requirements.txt | 10 ++--- 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/Pipfile b/Pipfile index a24247fd9..93e6c28cd 100644 --- a/Pipfile +++ b/Pipfile @@ -52,7 +52,7 @@ py-solc = {git = "https://github.com/nucypher/py-solc.git",ref = "v5.0.0-eol.0"} ansible = "*" bumpversion = "*" # Documentation -sphinx = "==2.4.4" +sphinx = "*" recommonmark = "*" sphinx_rtd_theme = "*" aafigure = "*" diff --git a/Pipfile.lock b/Pipfile.lock index f94c28723..136c6a599 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8b41cb7617ef0dab4fd0a669a5ee3f8efa2493ae96af67e47d171dea3343f3d0" + "sha256": "678a7b10ee7204d81814494ab13cc62247534a45e95e14b607fe82d6b3a7a354" }, "pipfile-spec": 6, "requires": { @@ -98,10 +98,10 @@ }, "certifi": { "hashes": [ - "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", - "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", + "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" ], - "version": "==2019.11.28" + "version": "==2020.4.5.1" }, "cffi": { "hashes": [ @@ -322,11 +322,11 @@ }, "flask": { "hashes": [ - "sha256:13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52", - "sha256:45eb5a6fd193d6cf7e0cf5d8a5b31f83d5faae0293695626f539a823e93b13f6" + "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060", + "sha256:8a4fdd8936eba2512e9c85df320a37e694c93945b33ef33c89946a340a238557" ], "index": "pypi", - "version": "==1.1.1" + "version": "==1.1.2" }, "flask-limiter": { "hashes": [ @@ -361,10 +361,10 @@ }, "humanize": { "hashes": [ - "sha256:0b3157df0f3fcdcb7611180d305a23fd4b6290eb23586e058762f8576348fbab", - "sha256:de8ef6ffee618a9d369b3d1fb1359780ccaa2cc76a0e777c6ff21f04d19a0eb8" + "sha256:98b7ac9d1a70ad62175c8e0dd44beebbd92418727fc4e214468dfb2baa8ebfb5", + "sha256:bc2a1ff065977011de2bc36197a4b14730c54bfc46ab12a153376684573a2dab" ], - "version": "==2.2.0" + "version": "==2.3.0" }, "hyperlink": { "hashes": [ @@ -593,11 +593,11 @@ }, "py-geth": { "hashes": [ - "sha256:4af3d8e07738b2991d755c31d5de2d39231aa43c3ca28b74f44d7a5e9792eaff", - "sha256:96b453af4812a152fc71e5736b3e2b457927c58f72b50716b774aadb136c1d0e" + "sha256:a9178c1e25b313e3aba8b66cae3b19b4c68aa9b5d1494b2dbe891100ce7cd8db", + "sha256:dfbc4dcd10592fbcfb2994206e29201cb63e284490f5e3d21ef4f0966a9c9971" ], "index": "pypi", - "version": "==2.2.0" + "version": "==2.3.0" }, "pyasn1": { "hashes": [ @@ -764,29 +764,29 @@ }, "regex": { "hashes": [ - "sha256:01b2d70cbaed11f72e57c1cfbaca71b02e3b98f739ce33f5f26f71859ad90431", - "sha256:046e83a8b160aff37e7034139a336b660b01dbfe58706f9d73f5cdc6b3460242", - "sha256:113309e819634f499d0006f6200700c8209a2a8bf6bd1bdc863a4d9d6776a5d1", - "sha256:200539b5124bc4721247a823a47d116a7a23e62cc6695744e3eb5454a8888e6d", - "sha256:25f4ce26b68425b80a233ce7b6218743c71cf7297dbe02feab1d711a2bf90045", - "sha256:269f0c5ff23639316b29f31df199f401e4cb87529eafff0c76828071635d417b", - "sha256:5de40649d4f88a15c9489ed37f88f053c15400257eeb18425ac7ed0a4e119400", - "sha256:7f78f963e62a61e294adb6ff5db901b629ef78cb2a1cfce3cf4eeba80c1c67aa", - "sha256:82469a0c1330a4beb3d42568f82dffa32226ced006e0b063719468dcd40ffdf0", - "sha256:8c2b7fa4d72781577ac45ab658da44c7518e6d96e2a50d04ecb0fd8f28b21d69", - "sha256:974535648f31c2b712a6b2595969f8ab370834080e00ab24e5dbb9d19b8bfb74", - "sha256:99272d6b6a68c7ae4391908fc15f6b8c9a6c345a46b632d7fdb7ef6c883a2bbb", - "sha256:9b64a4cc825ec4df262050c17e18f60252cdd94742b4ba1286bcfe481f1c0f26", - "sha256:9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5", - "sha256:9ff16d994309b26a1cdf666a6309c1ef51ad4f72f99d3392bcd7b7139577a1f2", - "sha256:b33ebcd0222c1d77e61dbcd04a9fd139359bded86803063d3d2d197b796c63ce", - "sha256:bba52d72e16a554d1894a0cc74041da50eea99a8483e591a9edf1025a66843ab", - "sha256:bed7986547ce54d230fd8721aba6fd19459cdc6d315497b98686d0416efaff4e", - "sha256:c7f58a0e0e13fb44623b65b01052dae8e820ed9b8b654bb6296bc9c41f571b70", - "sha256:d58a4fa7910102500722defbde6e2816b0372a4fcc85c7e239323767c74f5cbc", - "sha256:f1ac2dc65105a53c1c2d72b1d3e98c2464a133b4067a51a3d2477b28449709a0" + "sha256:08119f707f0ebf2da60d2f24c2f39ca616277bb67ef6c92b72cbf90cbe3a556b", + "sha256:0ce9537396d8f556bcfc317c65b6a0705320701e5ce511f05fc04421ba05b8a8", + "sha256:1cbe0fa0b7f673400eb29e9ef41d4f53638f65f9a2143854de6b1ce2899185c3", + "sha256:2294f8b70e058a2553cd009df003a20802ef75b3c629506be20687df0908177e", + "sha256:23069d9c07e115537f37270d1d5faea3e0bdded8279081c4d4d607a2ad393683", + "sha256:24f4f4062eb16c5bbfff6a22312e8eab92c2c99c51a02e39b4eae54ce8255cd1", + "sha256:295badf61a51add2d428a46b8580309c520d8b26e769868b922750cf3ce67142", + "sha256:2a3bf8b48f8e37c3a40bb3f854bf0121c194e69a650b209628d951190b862de3", + "sha256:4385f12aa289d79419fede43f979e372f527892ac44a541b5446617e4406c468", + "sha256:5635cd1ed0a12b4c42cce18a8d2fb53ff13ff537f09de5fd791e97de27b6400e", + "sha256:5bfed051dbff32fd8945eccca70f5e22b55e4148d2a8a45141a3b053d6455ae3", + "sha256:7e1037073b1b7053ee74c3c6c0ada80f3501ec29d5f46e42669378eae6d4405a", + "sha256:90742c6ff121a9c5b261b9b215cb476eea97df98ea82037ec8ac95d1be7a034f", + "sha256:a58dd45cb865be0ce1d5ecc4cfc85cd8c6867bea66733623e54bd95131f473b6", + "sha256:c087bff162158536387c53647411db09b6ee3f9603c334c90943e97b1052a156", + "sha256:c162a21e0da33eb3d31a3ac17a51db5e634fc347f650d271f0305d96601dc15b", + "sha256:c9423a150d3a4fc0f3f2aae897a59919acd293f4cb397429b120a5fcd96ea3db", + "sha256:ccccdd84912875e34c5ad2d06e1989d890d43af6c2242c6fcfa51556997af6cd", + "sha256:e91ba11da11cf770f389e47c3f5c30473e6d85e06d7fd9dcba0017d2867aab4a", + "sha256:ea4adf02d23b437684cd388d557bf76e3afa72f7fed5bbc013482cc00c816948", + "sha256:fb95debbd1a824b2c4376932f2216cc186912e389bdb0e27147778cf6acb3f89" ], - "version": "==2020.2.20" + "version": "==2020.4.4" }, "requests": { "hashes": [ @@ -1085,10 +1085,10 @@ }, "certifi": { "hashes": [ - "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", - "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" + "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304", + "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519" ], - "version": "==2019.11.28" + "version": "==2020.4.5.1" }, "cffi": { "hashes": [ @@ -1396,10 +1396,10 @@ }, "pyparsing": { "hashes": [ - "sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f", - "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec" + "sha256:67199f0c41a9c702154efb0e7a8cc08accf830eb003b4d9fa42c4059002e2492", + "sha256:700d17888d441604b0bd51535908dcb297561b040819cccde647a92439db5a2a" ], - "version": "==2.4.6" + "version": "==3.0.0a1" }, "pytest": { "hashes": [ @@ -1434,11 +1434,11 @@ }, "pytest-mypy": { "hashes": [ - "sha256:ea5da19d7343d4ccd98c3fe39cc30dee2743b9fbf00999b2a863e3ead78e353c", - "sha256:f55dfbdd9e6749f5af3896e8ad813b611c3acadcec16ba728738777ccf9ce1d4" + "sha256:bb70bb64768a87dbbee250eee7932c84d1e8ccf68c4ce0651304b9598d072d6b", + "sha256:f766b229b2760f99524f2c40c24e3288d4853334e560ab5b59a4ebffb2d4cb1d" ], "index": "pypi", - "version": "==0.6.0" + "version": "==0.6.1" }, "pytest-twisted": { "hashes": [ @@ -1511,11 +1511,11 @@ }, "sphinx": { "hashes": [ - "sha256:b4c750d546ab6d7e05bdff6ac24db8ae3e8b8253a3569b754e445110a0a12b66", - "sha256:fc312670b56cb54920d6cc2ced455a22a547910de10b3142276495ced49231cb" + "sha256:6a099e6faffdc3ceba99ca8c2d09982d43022245e409249375edf111caf79ed3", + "sha256:b63a0c879c4ff9a4dffcb05217fa55672ce07abdeb81e33c73303a563f8d8901" ], "index": "pypi", - "version": "==2.4.4" + "version": "==3.0.0" }, "sphinx-rtd-theme": { "hashes": [ diff --git a/dev-requirements.txt b/dev-requirements.txt index bef97a70b..6b21f5be6 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -6,7 +6,7 @@ apipkg==1.5 attrs==19.3.0 babel==2.8.0 bumpversion==0.5.3 -certifi==2019.11.28 +certifi==2020.4.5.1 cffi==1.14.0 chardet==3.0.4 commonmark==0.9.1 @@ -31,11 +31,11 @@ pluggy==0.13.1 py==1.8.1 pycparser==2.20 pygments==2.6.1 -pyparsing==2.4.6 +pyparsing==3.0.0a1 pytest-cov==2.8.1 pytest-forked==1.1.3 pytest-mock==3.0.0 -pytest-mypy==0.6.0 +pytest-mypy==0.6.1 pytest-twisted==1.12 pytest-xdist==1.31.0 pytest==5.4.1 @@ -46,7 +46,7 @@ requests==2.23.0 six==1.14.0 snowballstemmer==2.0.0 sphinx-rtd-theme==0.4.3 -sphinx==2.4.4 +sphinx==3.0.0 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==1.0.3 diff --git a/docs/source/conf.py b/docs/source/conf.py index ed9094881..3ca01ea36 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -52,6 +52,7 @@ extensions = [ 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'aafigure.sphinxext', + 'recommonmark', ] # Add any paths that contain templates here, relative to this directory. @@ -61,11 +62,6 @@ templates_path = ['.templates'] # You can specify multiple suffix as a list of string: # -source_parsers = { - '.md': CommonMarkParser, -} - - source_suffix = ['.rst', '.md', '.txt'] # The master toctree document. diff --git a/requirements.txt b/requirements.txt index 1bc3a4312..a793238e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ base58==2.0.0 blake2b-py==0.1.3 bytestring-splitter==1.3.0 cached-property==1.5.1 -certifi==2019.11.28 +certifi==2020.4.5.1 cffi==1.14.0 chardet==3.0.4 click==7.1.1 @@ -32,10 +32,10 @@ eth-typing==2.2.1 eth-utils==1.8.4 flask-limiter==1.2.1 flask-sqlalchemy==2.4.1 -flask==1.1.1 +flask==1.1.2 hendrix==3.3.0 hexbytes==0.2.0 -humanize==2.2.0 +humanize==2.3.0 hyperlink==19.0.0 idna==2.9 importlib-metadata==1.6.0 ; python_version < '3.8' @@ -59,7 +59,7 @@ pendulum==2.1.0 protobuf==3.11.3 py-ecc==1.7.1 py-evm==0.3.0a14 -py-geth==2.2.0 +py-geth==2.3.0 pyasn1-modules==0.2.8 pyasn1==0.4.8 pychalk==2.0.1 @@ -74,7 +74,7 @@ pysha3==1.0.2 python-dateutil==2.8.1 pytz==2019.3 pytzdata==2019.3 -regex==2020.2.20 +regex==2020.4.4 requests==2.23.0 rlp==1.2.0 semantic-version==2.8.4