Fix docs and cloud requirements

wbh1 · Sep 23, 2021 · 0cb3e7d · 0cb3e7d
1 parent 0aaa26b
commit 0cb3e7d
Show file tree

Hide file tree

Showing 10 changed files with 3,480 additions and 330 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -810,25 +810,10 @@ repos:
 
 
   # ----- Cloud CI Requirements ------------------------------------------------------------------------------------->
-      - id: pip-tools-compile
-        alias: compile-ci-cloud-py3.5-requirements
-        name: Cloud CI Py3.5 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.5/cloud\.txt)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.5
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - --include=requirements/pytest.txt
-          - --include=requirements/static/pkg/linux.in
-          - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
-          - requirements/static/ci/cloud.in
-
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.6-requirements
         name: Cloud CI Py3.6 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.6/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.6/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
@@ -837,13 +822,14 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
+          - --include=requirements/static/ci/common.in
           - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
 
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.7-requirements
         name: Cloud CI Py3.7 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.7/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.7/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
@@ -852,13 +838,14 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
+          - --include=requirements/static/ci/common.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
 
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.8-requirements
         name: Cloud CI Py3.8 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.8/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.8/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
@@ -867,13 +854,14 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
+          - --include=requirements/static/ci/common.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
 
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.9-requirements
         name: Cloud CI Py3.9 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.9/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.9/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
@@ -882,13 +870,14 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
+          - --include=requirements/static/ci/common.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
 
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.10-requirements
         name: Cloud CI Py3.10 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.10/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.10/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
@@ -897,6 +886,7 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
+          - --include=requirements/static/ci/common.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
   # <---- Cloud CI Requirements --------------------------------------------------------------------------------------
@@ -916,7 +906,6 @@ repos:
           - --include=requirements/static/pkg/linux.in
           - --include=requirements/static/ci/linux.in
           - --include=requirements/static/ci/common.in
-          - --include=requirements/static/pkg/py{py_version}/linux.txt
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/docs.in
 
@@ -934,7 +923,6 @@ repos:
           - --include=requirements/static/pkg/linux.in
           - --include=requirements/static/ci/linux.in
           - --include=requirements/static/ci/common.in
-          - --include=requirements/static/pkg/py{py_version}/linux.txt
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/docs.in
 
@@ -952,7 +940,6 @@ repos:
           - --include=requirements/static/pkg/linux.in
           - --include=requirements/static/ci/linux.in
           - --include=requirements/static/ci/common.in
-          - --include=requirements/static/pkg/py{py_version}/linux.txt
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/docs.in
 
@@ -970,7 +957,6 @@ repos:
           - --include=requirements/static/pkg/linux.in
           - --include=requirements/static/ci/linux.in
           - --include=requirements/static/ci/common.in
-          - --include=requirements/static/pkg/py{py_version}/linux.txt
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/docs.in
 

diff --git a/noxfile.py b/noxfile.py
@@ -729,10 +729,15 @@ def pytest_cloud(session, coverage):
     """
     pytest cloud tests session
     """
+    pydir = _get_pydir(session)
+    if pydir == "py3.5":
+        session.error(
+            "Due to conflicting and unsupported requirements the cloud tests only run on Py3.6+"
+        )
     # Install requirements
     if _upgrade_pip_setuptools_and_wheel(session):
         requirements_file = os.path.join(
-            "requirements", "static", "ci", _get_pydir(session), "cloud.txt"
+            "requirements", "static", "ci", pydir, "cloud.txt"
         )
 
         install_command = ["--progress-bar=off", "-r", requirements_file]