Skip to content

Commit 8028f96

Browse files
tjmullicanimdellweg
andcommitted
Fix '--signing-service' option not allowing HREF
Co-Authored-By: Matthias Dellweg <[email protected]>
1 parent 1303bf0 commit 8028f96

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

CHANGES/38.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed '--signing-service' option not allowing to search by href.

pulpcore/cli/deb/publication.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def publication(ctx: click.Context, pulp_ctx: PulpCLIContext, publication_type:
7373
default_plugin="deb",
7474
default_type="apt",
7575
context_table={"deb:apt": PulpSigningServiceContext},
76+
href_pattern=PulpSigningServiceContext.HREF_PATTERN,
7677
help=_("Apt only: Signing service to use, pass in name or href"),
7778
),
7879
]

setup.py

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
from setuptools import setup
2-
3-
try:
4-
from setuptools import find_namespace_packages
5-
6-
plugin_packages = find_namespace_packages(
7-
include=["pulpcore.cli.*"], exclude=["pulpcore.cli.*.*"]
8-
)
9-
10-
except ImportError:
11-
# Old versions of setuptools do not provide `find_namespace_packages`
12-
# see https://github.com/pulp/pulp-cli/issues/248
13-
from setuptools import find_packages
14-
15-
plugins = find_packages(where="pulpcore/cli")
16-
plugin_packages = [f"pulpcore.cli.{plugin}" for plugin in plugins]
17-
18-
plugin_entry_points = [(package.rsplit(".", 1)[-1], package) for package in plugin_packages]
19-
20-
21-
setup(
22-
name="pulp-cli-deb",
23-
description="Command line interface to talk to pulpcore's REST API. (Debian plugin commands)",
24-
version="0.0.3.dev",
25-
packages=plugin_packages,
26-
package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
27-
python_requires=">=3.6",
28-
install_requires=[
29-
"pulp-cli>=0.15.0",
30-
],
31-
entry_points={
32-
"pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],
33-
},
34-
license="GPLv2+",
35-
classifiers=[
36-
"Development Status :: 3 - Alpha",
37-
"Environment :: Console",
38-
"Intended Audience :: System Administrators",
39-
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
40-
"Operating System :: OS Independent",
41-
"Programming Language :: Python :: 3",
42-
"Topic :: System :: Software Distribution",
43-
"Typing :: Typed",
44-
],
45-
)
1+
from setuptools import setup
2+
3+
try:
4+
from setuptools import find_namespace_packages
5+
6+
plugin_packages = find_namespace_packages(
7+
include=["pulpcore.cli.*"], exclude=["pulpcore.cli.*.*"]
8+
)
9+
10+
except ImportError:
11+
# Old versions of setuptools do not provide `find_namespace_packages`
12+
# see https://github.com/pulp/pulp-cli/issues/248
13+
from setuptools import find_packages
14+
15+
plugins = find_packages(where="pulpcore/cli")
16+
plugin_packages = [f"pulpcore.cli.{plugin}" for plugin in plugins]
17+
18+
plugin_entry_points = [(package.rsplit(".", 1)[-1], package) for package in plugin_packages]
19+
20+
21+
setup(
22+
name="pulp-cli-deb",
23+
description="Command line interface to talk to pulpcore's REST API. (Debian plugin commands)",
24+
version="0.0.3.dev",
25+
packages=plugin_packages,
26+
package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
27+
python_requires=">=3.6",
28+
install_requires=[
29+
"pulp-cli>=0.19.0",
30+
],
31+
entry_points={
32+
"pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],
33+
},
34+
license="GPLv2+",
35+
classifiers=[
36+
"Development Status :: 3 - Alpha",
37+
"Environment :: Console",
38+
"Intended Audience :: System Administrators",
39+
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
40+
"Operating System :: OS Independent",
41+
"Programming Language :: Python :: 3",
42+
"Topic :: System :: Software Distribution",
43+
"Typing :: Typed",
44+
],
45+
)

0 commit comments

Comments
 (0)