Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from setup.py to pyproject.toml #3813

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ values =

[bumpversion:file:./pulp_rpm/app/__init__.py]

[bumpversion:file:./setup.py]
[bumpversion:file:./pyproject.toml]
search = version = "{current_version}"
replace = version = "{new_version}"
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-393-g0e700c1
2021.08.26-394-gd21e6ea
6 changes: 3 additions & 3 deletions .github/workflows/scripts/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi
COMMIT_MSG=$(git log --format=%B --no-merges -1)
export COMMIT_MSG

COMPONENT_VERSION=$(sed -ne "s/\s*version.*=.*['\"]\(.*\)['\"][\s,]*/\1/p" setup.py)
COMPONENT_VERSION=$(python3 -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])")

mkdir .ci/ansible/vars || true
echo "---" > .ci/ansible/vars/main.yaml
Expand Down Expand Up @@ -61,10 +61,10 @@ then
fi

if [[ "$TEST" = "pulp" ]]; then
python3 .ci/scripts/calc_constraints.py -u requirements.txt > upperbounds_constraints.txt
python3 .ci/scripts/calc_constraints.py -u pyproject.toml > upperbounds_constraints.txt
fi
if [[ "$TEST" = "lowerbounds" ]]; then
python3 .ci/scripts/calc_constraints.py requirements.txt > lowerbounds_constraints.txt
python3 .ci/scripts/calc_constraints.py pyproject.toml > lowerbounds_constraints.txt
fi

if [ -f $POST_BEFORE_INSTALL ]; then
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ include pulp_rpm/app/schema/*
include pulp_rpm/tests/functional/sign-metadata.sh
include pulp_rpm/tests/sample-rpm-0-0.x86_64.rpm
include pyproject.toml
include requirements.txt
include test_requirements.txt
include unittest_requirements.txt
exclude releasing.md
46 changes: 46 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,52 @@ requires = [
]
build-backend = 'setuptools.build_meta'

[project]
name = "pulp-rpm"
version = "3.28.0.dev"
description = "Pulp plugin to manage RPM repositories"
readme = "README.rst"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
(Remember to change if the readme is ever translated to Markdown...)

authors = [
{name="Pulp Rpm Plugin Project Developers", email="pulp-dev@redhat.com"}
]
classifiers = [
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
"Operating System :: POSIX :: Linux",
"Development Status :: 5 - Production/Stable",
"Framework :: Django",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
requires-python = ">=3.9"
dependencies = [
"createrepo_c~=1.2",
"django_readonly_field~=1.1.1",
"jsonschema>=4.6,<5.0",
"libcomps>=0.1.20.post1,<0.2",
"productmd~=1.33.0",
"pulpcore>=3.49.11,<3.70",
"solv~=0.7.21",
"aiohttp_xmlrpc~=1.5.0",
"importlib-resources~=6.4.0",
]

[project.urls]
Homepage = "https://pulpproject.org"
Documentation = "https://pulpproject.org/pulp_rpm/"
Repository = "https://github.com/pulp/pulp_rpm"
"Bug Tracker" = "https://github.com/pulp/pulp_rpm/issues"
Changelog = "https://pulpproject.org/pulp_rpm/changes/"

[project.entry-points."pulpcore.plugin"]
pulp_rpm = "pulp_rpm:default_app_config"

[tool.setuptools.packages.find]
where = ["."]

[tool.towncrier]
package = "pulp_rpm"
filename = "CHANGES.md"
Expand Down
9 changes: 0 additions & 9 deletions requirements.txt

This file was deleted.

41 changes: 0 additions & 41 deletions setup.py

This file was deleted.