From 3114108c7a1604ab4ec507d48f6b09ff0a54154d Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Fri, 3 Nov 2023 13:09:04 -0400
Subject: [PATCH] Remove secrets sdk from doc requirements

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 .github/workflows/sdk-build.yml | 3 ---
 .readthedocs.yml                | 1 -
 docs/requirements.txt           | 3 +--
 requirements.txt                | 2 +-
 src/core/setup.py               | 6 +++++-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sdk-build.yml b/.github/workflows/sdk-build.yml
index 6e600369..b90cf85f 100644
--- a/.github/workflows/sdk-build.yml
+++ b/.github/workflows/sdk-build.yml
@@ -28,9 +28,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-      - name: Build keyring binary
-        run: maturin build
-        working-directory: src/secrets
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names
diff --git a/.readthedocs.yml b/.readthedocs.yml
index ca746b6f..3bd5116b 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -9,7 +9,6 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3"
-    rust: "1.70"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/docs/requirements.txt b/docs/requirements.txt
index af02bfd9..5601d12c 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,7 +1,6 @@
 sphinx_rtd_theme>=0.5.1
-sphinxcontrib-spelling==5.4.0
+sphinxcontrib-spelling==8.0.0
 -e ./src/core
--e ./src/secrets
 -e ./src/zos_console
 -e ./src/zos_files
 -e ./src/zos_jobs
diff --git a/requirements.txt b/requirements.txt
index f4d36111..a5a442e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ Unidecode==1.2.0
 urllib3==1.26.18
 wheel
 zipp==3.4.0
--e ./src/core
+-e ./src/core[secrets]
 -e ./src/secrets
 -e ./src/zos_console
 -e ./src/zos_files
diff --git a/src/core/setup.py b/src/core/setup.py
index 303c18ae..2711489d 100644
--- a/src/core/setup.py
+++ b/src/core/setup.py
@@ -21,10 +21,14 @@
     ],
     install_requires=[
         "commentjson",
+        "deepmerge",
+        "jsonschema",
         "pyyaml",
         "requests",
         "urllib3",
-        resolve_sdk_dep("secrets", "~=0.1.0"),
     ],
+    extras_require={
+        "secrets": [resolve_sdk_dep("secrets", "~=0.1.0")]
+    },
     packages=find_namespace_packages(include=["zowe.*"]),
 )