Merge aaea530 into f3a2249

reanahub · Sep 29, 2020 · 5ff26df · 5ff26df
2 parents f3a2249 + aaea530
commit 5ff26df
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,6 +9,7 @@ include .dockerignore
 include LICENSE
 include *.rst
 include *.sh
+include *.in
 include *.txt
 include pytest.ini
 recursive-include docs *.py

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,6 +48,9 @@
     "sphinx.ext.viewcode",
 ]
 
+# Autodoc mocking to fix ReadTheDocs builds missing system dependencies
+autodoc_mock_imports = ["jq"]
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -4,4 +4,4 @@
 # REANA is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
--e .[all]
+-e .[docs]
diff --git a/requirements.in b/requirements.in
@@ -0,0 +1,7 @@
+# This file is part of REANA.
+# Copyright (C) 2017, 2018 CERN.
+#
+# REANA is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+jq==0.1.7
diff --git a/requirements.txt b/requirements.txt
@@ -19,7 +19,7 @@ decorator==4.4.2          # via jsonpath-rw, networkx
 glob2==0.7                # via packtivity, yadage
 graphviz==0.14.1          # via reana-workflow-engine-yadage (setup.py)
 idna==2.8                 # via jsonschema, requests
-jq==0.1.7                 # via packtivity, reana-workflow-engine-yadage (setup.py), yadage
+jq==0.1.7                 # via packtivity, -r requirements.in, yadage
 jsonpath-rw==1.4.0        # via packtivity, yadage
 jsonpointer==2.0          # via jsonschema, packtivity, yadage
 jsonref==0.2              # via bravado-core, packtivity, yadage, yadage-schemas

diff --git a/setup.py b/setup.py
@@ -26,6 +26,7 @@
     "debug": ["wdb", "ipdb", "Flask-DebugToolbar",],
     "docs": ["Sphinx>=1.5.1", "sphinx-rtd-theme>=0.1.9",],
     "tests": tests_require,
+    "jq": ["jq==0.1.7",],
 }
 
 extras_require["all"] = []
@@ -43,7 +44,6 @@
     "adage==0.10.1",  # FIXME remove once yadage-schemas solves yadage deps.
     "click>=7",
     "graphviz>=0.12",  # FIXME needed only if yadage visuale=True.
-    "jq==0.1.7",
     "networkx==1.11",
     "packtivity==0.14.21",
     "pydot2>=1.0.33",  # FIXME needed only if yadage visuale=True.