Merge pull request #3 from weedySeaDragon/190311-rtd-yaml

rtd.yml: python use (global) system packages; sync both requirements.…
weedySeaDragon · Mar 11, 2019 · 2b44950 · 2b44950
2 parents 645c582 + 2c3e08e
commit 2b44950
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 5 deletions.
diff --git a/Pipfile b/Pipfile
@@ -9,4 +9,4 @@ verify_ssl = true
 sphinx = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -1,9 +1,18 @@
 # readthedocs.yml
 # https://read-the-docs.readthedocs.io/en/latest/yaml-config.html#python-extra-requirements
 
+version: 2
+
 # use the latest image because that will include plantuml.  maybe.
 build:
-  image: 4.0
+  image: latest
+
 
 python:
-  version: 3.6
+  version: 3.7
+  install:
+    - requirements: requirements.txt
+    - requirements: src/site/sphinx/requirements.txt
+    - method: pip
+      path: .
+  system_packages: true
diff --git a/src/site/sphinx/requirements.txt b/src/site/sphinx/requirements.txt
@@ -6,6 +6,7 @@ chardet
 dataclasses
 dectate
 docutils
+entrypoints
 filelock
 flake8
 future
@@ -27,7 +28,10 @@ Pillow
 pipenv
 pluggy
 py
+pycodestyle
+pydantic
 pydash
+pyflakes
 Pygments
 pyparsing
 pytz
@@ -37,12 +41,12 @@ semantic-version
 six
 snowballstemmer
 soupsieve
-
 Sphinx==1.8.4
 sphinx-fontawesome==0.0.6
 sphinx-rtd-theme==0.4.1
 sphinxcontrib-plantuml
 sphinxcontrib-websupport
-
 urllib3
+virtualenv
+virtualenv-clone
 wrapt