Skip to content

Commit

Permalink
Fix '--signing-service' option not allowing HREF
Browse files Browse the repository at this point in the history
Co-Authored-By: Matthias Dellweg <2500@gmx.de>
  • Loading branch information
tjmullicani and mdellweg committed Jun 7, 2023
1 parent 1303bf0 commit 8028f96
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 45 deletions.
1 change: 1 addition & 0 deletions CHANGES/38.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed '--signing-service' option not allowing to search by href.
1 change: 1 addition & 0 deletions pulpcore/cli/deb/publication.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def publication(ctx: click.Context, pulp_ctx: PulpCLIContext, publication_type:
default_plugin="deb",
default_type="apt",
context_table={"deb:apt": PulpSigningServiceContext},
href_pattern=PulpSigningServiceContext.HREF_PATTERN,
help=_("Apt only: Signing service to use, pass in name or href"),
),
]
Expand Down
90 changes: 45 additions & 45 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
from setuptools import setup

try:
from setuptools import find_namespace_packages

plugin_packages = find_namespace_packages(
include=["pulpcore.cli.*"], exclude=["pulpcore.cli.*.*"]
)

except ImportError:
# Old versions of setuptools do not provide `find_namespace_packages`
# see https://github.com/pulp/pulp-cli/issues/248
from setuptools import find_packages

plugins = find_packages(where="pulpcore/cli")
plugin_packages = [f"pulpcore.cli.{plugin}" for plugin in plugins]

plugin_entry_points = [(package.rsplit(".", 1)[-1], package) for package in plugin_packages]


setup(
name="pulp-cli-deb",
description="Command line interface to talk to pulpcore's REST API. (Debian plugin commands)",
version="0.0.3.dev",
packages=plugin_packages,
package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
python_requires=">=3.6",
install_requires=[
"pulp-cli>=0.15.0",
],
entry_points={
"pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],
},
license="GPLv2+",
classifiers=[
"Development Status :: 3 - Alpha",
"Environment :: Console",
"Intended Audience :: System Administrators",
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Topic :: System :: Software Distribution",
"Typing :: Typed",
],
)
from setuptools import setup

try:
from setuptools import find_namespace_packages

plugin_packages = find_namespace_packages(
include=["pulpcore.cli.*"], exclude=["pulpcore.cli.*.*"]
)

except ImportError:
# Old versions of setuptools do not provide `find_namespace_packages`
# see https://github.com/pulp/pulp-cli/issues/248
from setuptools import find_packages

plugins = find_packages(where="pulpcore/cli")
plugin_packages = [f"pulpcore.cli.{plugin}" for plugin in plugins]

plugin_entry_points = [(package.rsplit(".", 1)[-1], package) for package in plugin_packages]


setup(
name="pulp-cli-deb",
description="Command line interface to talk to pulpcore's REST API. (Debian plugin commands)",
version="0.0.3.dev",
packages=plugin_packages,
package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
python_requires=">=3.6",
install_requires=[
"pulp-cli>=0.19.0",
],
entry_points={
"pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],
},
license="GPLv2+",
classifiers=[
"Development Status :: 3 - Alpha",
"Environment :: Console",
"Intended Audience :: System Administrators",
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Topic :: System :: Software Distribution",
"Typing :: Typed",
],
)

0 comments on commit 8028f96

Please sign in to comment.