Skip to content

Commit

Permalink
Switch to using pyproject.toml
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
mdellweg authored and dkliban committed Mar 12, 2024
1 parent 6d49a4f commit 39a57b9
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 92 deletions.
4 changes: 2 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ values =

[bumpversion:file:./pulpcore/cli/maven/__init__.py]

[bumpversion:file:./pulp-glue-maven/setup.py]
[bumpversion:file:./pulp-glue-maven/pyproject.toml]

[bumpversion:file:./setup.py]
[bumpversion:file:./pyproject.toml]
2 changes: 1 addition & 1 deletion .github/workflows/collect_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
pip install GitPython packaging toml
python3 .ci/scripts/collect_changes.py
- name: "Create Pull Request"
uses: "peter-evans/create-pull-request@v5"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
title: "Update Changelog"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: |
.ci/scripts/create_release_branch.sh
- name: "Create Pull Request"
uses: "peter-evans/create-pull-request@v5"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
title: "Bump dev-version"
Expand Down
Empty file.
40 changes: 40 additions & 0 deletions pulp-glue-maven/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "pulp-glue-maven"
version = "0.3.0.dev"
description = "Version agnostic glue library to talk to pulpcore's REST API. (Maven plugin)"
readme = "README.md"
requires-python = ">=3.8"
license = {text = "GPLv2+"}
authors = [
{name = "Pulp Team", email = "[email protected]"},
]
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Other Environment",
"Intended Audience :: Developers",
"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",
]
dependencies = [
"pulp-glue>=0.24.0,<0.25.0.dev",
]

[project.urls]
repository = "https://github.com/pulp/pulp-cli-maven"
changelog = "https://github.com/pulp/pulp-cli-maven/blob/main/CHANGES.md"

[tool.setuptools.packages.find]
where = ["."]
include = ["pulp_glue.*"]
namespaces = true

[tool.setuptools.package-data]
"*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]

[tool.black]
line-length = 100

Expand Down
45 changes: 0 additions & 45 deletions pulp-glue-maven/setup.py

This file was deleted.

54 changes: 53 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "pulp-cli-maven"
version = "0.3.0.dev"
description = "Command line interface to talk to pulpcore's REST API. (Maven plugin commands)"
readme = "README.md"
requires-python = ">=3.8"
license = {text = "GPLv2+"}
authors = [
{name = "Pulp Team", email = "[email protected]"},
]
classifiers=[
"Development Status :: 4 - Beta",
"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",
]
dependencies = [
"pulp-cli>=0.24.0,<0.25.0.dev",
"pulp-glue-maven==0.3.0.dev",
]

[project.urls]
repository = "https://github.com/pulp/pulp-cli-maven"
changelog = "https://github.com/pulp/pulp-cli-maven/blob/main/CHANGES.md"

[project.entry-points."pulp_cli.plugins"]
maven = "pulpcore.cli.maven"

[tool.setuptools.packages.find]
where = ["."]
include = ["pulpcore.cli.*"]
namespaces = true

[tool.setuptools.package-data]
"*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]

[tool.pulp_cli_template]
app_label = "maven"
glue = true
Expand All @@ -23,13 +67,21 @@ test_matrix = """
"""

[tool.towncrier]
package = "pulpcore.cli.maven"
filename = "CHANGES.md"
directory = "CHANGES/"
title_format = "## {version} ({project_date})"
template = "CHANGES/.TEMPLATE.md"
issue_format = "[#{issue}](https://github.com/pulp/pulp-cli-maven/issues/{issue})"
start_string = "[//]: # (towncrier release notes start)\n"
underlines = ["", "", ""]

[[tool.towncrier.section]]
path = ""
name = ""

[[tool.towncrier.section]]
path = "pulp-glue-maven"
name = "Pulp-maven GLUE"

[[tool.towncrier.type]]
directory = "feature"
Expand Down
42 changes: 0 additions & 42 deletions setup.py

This file was deleted.

0 comments on commit 39a57b9

Please sign in to comment.