Revert "Add markdown to root Pipfile"

This reverts commit 251d5ab.
Checkmk · Oct 24, 2024 · 0d9d877 · 0d9d877
1 parent a4f6303
commit 0d9d877
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 37 deletions.
diff --git a/Pipfile b/Pipfile
@@ -90,7 +90,6 @@ uvicorn = "*"
 webtest = "*"  # used by WSGI based tests
 
 [packages]
-markdown = "*"  # Should be in cmk-werks, see CMK-19819
 setuptools = "<=70.3.0"  # See https://github.com/pypa/setuptools/issues/4487#issuecomment-2237487845 for context
 setuptools-scm = "==4.1.2"  # needed by various setup.py
 six = "==1.16.0"  # direct dependency + needed by python-dateutil, vcrpy, python-active-directory

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/requirements_lock.txt b/requirements_lock.txt
@@ -694,7 +694,7 @@ cssselect==1.2.0 ; python_version >= "3.7" \
     # via
     #   -r requirements_cmk.txt
     #   types-lxml
-cython==0.29.34 ; python_version >= "2.6" and python_version not in "3.0, 3.1, 3.2" \
+cython==0.29.34 ; python_version >= "2.6" and python_version not in "3.0, 3.1, 3.2, 3.3" \
     --hash=sha256:03daae07f8cbf797506446adae512c3dd86e7f27a62a541fa1ee254baf43e32c \
     --hash=sha256:0963266dad685812c1dbb758fcd4de78290e3adc7db271c8664dcde27380b13e \
     --hash=sha256:0ab3cbf3d62b0354631a45dc93cfcdf79098663b1c65a6033af4a452b52217a7 \
@@ -1797,12 +1797,10 @@ lxml==4.9.3 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2,
     #   -r packages/cmk-werks/requirements.txt
     #   -r requirements_cmk.txt
     #   exchangelib
-markdown==3.7 ; python_version >= "3.8" \
+markdown==3.7 \
     --hash=sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 \
     --hash=sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803
-    # via
-    #   -r packages/cmk-werks/requirements.txt
-    #   -r requirements_cmk.txt
+    # via -r packages/cmk-werks/requirements.txt
 markdown-it-py==3.0.0 ; python_version >= "3.8" \
     --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \
     --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb
@@ -2574,9 +2572,9 @@ propcache==0.2.0 ; python_version >= "3.8" \
     # via
     #   -r requirements_cmk.txt
     #   yarl
-proto-plus==1.25.0 ; python_version >= "3.7" \
-    --hash=sha256:c91fc4a65074ade8e458e95ef8bac34d4008daa7cce4a12d6707066fca648961 \
-    --hash=sha256:fbb17f57f7bd05a68b7707e745e26528b0b3c34e378db91eef93912c54982d91
+proto-plus==1.24.0 ; python_version >= "3.7" \
+    --hash=sha256:30b72a5ecafe4406b0d339db35b56c4059064e69227b8c3bda7462397f966445 \
+    --hash=sha256:402576830425e5f6ce4c2a6702400ac79897dab0b4343821aa5188b0fab81a12
     # via
     #   -r requirements_cmk.txt
     #   google-api-core
@@ -3202,7 +3200,7 @@ python-active-directory==2.0.1 \
     --hash=sha256:fc5f5bf45840e33e000527eaa9241b264e651c764b800bdd9a920449e3f3c57a \
     --hash=sha256:febd238057469a11650db2a178d269a5142e106381197e3754c6c15815c97082
     # via -r requirements_cmk.txt
-python-dateutil==2.9.0.post0 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2" \
+python-dateutil==2.9.0.post0 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3" \
     --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
     --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
     # via
@@ -3722,7 +3720,7 @@ sgmllib3k==1.0.0 \
     # via
     #   -r requirements_cmk.txt
     #   feedparser
-six==1.16.0 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2" \
+six==1.16.0 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3" \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
@@ -3944,7 +3942,7 @@ time-machine==2.16.0 ; python_version >= "3.9" \
     # via
     #   -r packages/cmk-crypto/requirements.txt
     #   -r requirements_cmk.txt
-toml==0.10.2 ; python_version >= "2.6" and python_version not in "3.0, 3.1, 3.2" \
+toml==0.10.2 ; python_version >= "2.6" and python_version not in "3.0, 3.1, 3.2, 3.3" \
     --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
     --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
     # via
@@ -3974,7 +3972,7 @@ tqdm==4.66.5 ; python_version >= "3.7" \
     # via
     #   -r requirements_cmk.txt
     #   pysmb
-trickkiste==0.1.7 ; python_full_version >= "3.10.4" and python_version < "4" \
+trickkiste==0.1.7 ; python_version < "4" and python_full_version >= "3.10.4" \
     --hash=sha256:9479ad147f23de5ed4da6e73bccdcd19699da1d78bb0121dc25978265d30128d \
     --hash=sha256:e7a03ab19c0fd8f512506d382fb966ff09d13fc4b8411c7fb66fc6f3f72da2a7
     # via
@@ -4287,7 +4285,7 @@ webcolors==24.8.0 \
     # via
     #   -r requirements_cmk.txt
     #   jsonschema
-webob==1.8.8 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2" \
+webob==1.8.8 ; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3" \
     --hash=sha256:2abc1555e118fc251e705fc6dc66c7f5353bb9fbfab6d20e22f1c02b4b71bcee \
     --hash=sha256:b60ba63f05c0cf61e086a10c3781a41fcfe30027753a8ae6d819c77592ce83ea
     # via

diff --git a/tests/code_quality/test_pipfile.py b/tests/code_quality/test_pipfile.py
@@ -355,8 +355,6 @@ def get_undeclared_dependencies() -> Iterable[Import]:
 def test_dependencies_are_used() -> None:
     known_unused_packages = set(CEE_UNUSED_PACKAGES)
     known_unused_packages.add("setuptools")  # pinned transitive dependency
-    known_unused_packages.add("markdown")  # Should be in cmk-werks, see CMK-19819
-
     if not is_enterprise_repo():
         known_unused_packages.update(("PyPDF", "numpy", "roman"))