various: update pip+https URLs to new form.

See Fixes: for a discussion.

Fixes: https://tracker.ceph.com/issues/72917
Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/admin/doc-read-the-docs.txt b/admin/doc-read-the-docs.txt
index 7e0ecc86d75b004be2dcb37f5f9bca6dd1023893..ed405c4e3bddcf67e9b4c38d6836e08fda51139e 100644 (file)
--- a/admin/doc-read-the-docs.txt
+++ b/admin/doc-read-the-docs.txt
@@ -1,2 +1,2 @@
 plantweb
-git+https://github.com/readthedocs/readthedocs-sphinx-search@main
+readthedocs-sphinx-search@git+https://github.com/readthedocs/readthedocs-sphinx-search@main

diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index 164896329b7523660918c7445ad0aaaa4dab5495..c350bb63db6e9f2cdc4edacf7ffc9f889b35af78 100644 (file)
--- a/admin/doc-requirements.txt
+++ b/admin/doc-requirements.txt
@@ -1,7 +1,7 @@
 # RTD theme does not work with >= 7 https://github.com/readthedocs/readthedocs.org/issues/10279
 Sphinx < 7
-git+https://github.com/ceph/sphinx-ditaa.git@py3#egg=sphinx-ditaa
-git+https://github.com/vlasovskikh/funcparserlib.git
+sphinx-ditaa@git+https://github.com/ceph/sphinx-ditaa.git@py3
+funcparserlib@git+https://github.com/vlasovskikh/funcparserlib.git
 breathe >= 4.20.0,!=4.33
 cryptography
 Jinja2

diff --git a/qa/tox.ini b/qa/tox.ini
index af4c699919909da8d4663b4d4072d33c7a14d151..a468c1051c66f4470792e3bbf121cd08ae02aeea 100644 (file)
--- a/qa/tox.ini
+++ b/qa/tox.ini
@@ -31,7 +31,7 @@ commands = mypy --no-namespace-packages {posargs:.}
 [testenv:py3]
 basepython = python3
 deps =
-  {env:TEUTHOLOGY_GIT:git+https://github.com/ceph/teuthology.git@main}#egg=teuthology[coverage,orchestra,test]
+  teuthology[coverage,orchestra,test]@{env:TEUTHOLOGY_GIT:git+https://github.com/ceph/teuthology.git@main}
   httplib2
   pytest
 commands =

diff --git a/src/test/run-cli-tests b/src/test/run-cli-tests
index 5fa1eff240ab7b0f824198c226d33c7392027f79..3a29f140319e13055c5ba206eb00e0c535cd3fcb 100755 (executable)
--- a/src/test/run-cli-tests
+++ b/src/test/run-cli-tests
@@ -26,7 +26,7 @@ if [ ! -e "$CRAM_BIN" ]; then
     # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
     # -- tv@inktank.com
     python3 -m venv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt \
-        install git+https://github.com/ceph/cram.git@0.7-error-dir#egg=cram
+        install 'cram@git+https://github.com/ceph/cram.git@0.7-error-dir'
 fi
 
 SRCDIR_ABS="$(readlink -f "$SRCDIR")"