From 642fbea5e409e8aaa91d4c911df34498b8e6fe4d Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 15 Dec 2022 18:29:52 -0500 Subject: [PATCH] Remove unnecessary #egg= URL fragment There's discussion in the pip project about removing support for the '#egg=name' in a URL requirement specifier [0]. Since it's redundant in our current usage in cinderlib (since the URL base component and the package name are the same for os-brick and cinder), just remove it and then whatever they decide to do about this in upstream pip won't affect us. [0] https://discuss.python.org/t/killing-off-the-egg-fragment-once-and-for-all/21660 Change-Id: If4ce5cbac388eea99ecfc5d4baee15397a61d6e5 --- doc/source/contributor/contributing.rst | 8 ++++---- tox.ini | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst index 03fc6f9..752bf76 100644 --- a/doc/source/contributor/contributing.rst +++ b/doc/source/contributor/contributing.rst @@ -116,8 +116,8 @@ the release that this is the development branch for. # latest cinder/brick code instead of released code. # NOTE: Functional tests may fail if host is missing bindeps from deps projects deps= -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/os-brick#egg=os-brick - git+https://opendev.org/openstack/cinder#egg=cinder + git+https://opendev.org/openstack/os-brick + git+https://opendev.org/openstack/cinder * When the coordinated release for cycle 'n' has occurred, cinderlib's ``tox.ini`` in master must be modified so that cinderlib is being tested @@ -127,8 +127,8 @@ the release that this is the development branch for. .. code-block:: deps = -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/os-brick@stable/yoga#egg=os-brick - git+https://opendev.org/openstack/cinder@stable/yoga#egg=cinder + git+https://opendev.org/openstack/os-brick@stable/yoga + git+https://opendev.org/openstack/cinder@stable/yoga * After the 'n' release of cinderlib occurs (and the stable/n branch is cut), all of cinder, os-brick, and cinderlib master branches are all 'n+1' cycle diff --git a/tox.ini b/tox.ini index d8e422e..f5e2941 100644 --- a/tox.ini +++ b/tox.ini @@ -32,8 +32,8 @@ usedevelop=True # NOTE: Functional tests may fail if host is missing bindeps from deps projects deps = -r{toxinidir}/test-requirements.txt - git+https://opendev.org/openstack/os-brick#egg=os-brick - git+https://opendev.org/openstack/cinder#egg=cinder + git+https://opendev.org/openstack/os-brick + git+https://opendev.org/openstack/cinder commands = find . -ignore_readdir_race -type f -name "*.pyc" -delete