Skip to content

Commit

Permalink
Merge pull request #1203 from mdellweg/pyproject
Browse files Browse the repository at this point in the history
Pyproject
  • Loading branch information
mdellweg authored Nov 28, 2024
2 parents c36181d + d3a0289 commit 30a73a0
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 87 deletions.
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
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## Contributing

We have provided detailed documentation for ways in which you can
contribute to Pulp here:
https://pulpproject.org/dev/

This documentation includes:

* Suggestions of how to contribute
* How we track bugs
* Ways to get in touch with other contributors who can advise you
* A contribution checklist
* A developer guide

Join us! We look forward to hearing from you.
35 changes: 0 additions & 35 deletions CONTRIBUTING.rst

This file was deleted.

Empty file removed HISTORY.rst
Empty file.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include CHANGES.md
include COMMITMENT
exclude CONTRIBUTING.md
include COPYRIGHT
include functest_requirements.txt
include HISTORY.rst
include LICENSE
include pulp_deb/app/schema/*
include pulp_deb/tests/functional/sign_deb_release.sh
Expand Down
52 changes: 48 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,49 @@ requires = [
]
build-backend = 'setuptools.build_meta'

[project]
name = "pulp-deb"
version = "3.5.0.dev"
description = "pulp-deb plugin for the Pulp Project"
readme = "README.md"
authors = [
{name="Matthias Dellweg", email="[email protected]"},
]
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 = [
# All things django and asyncio are deliberately left to pulpcore
# Example transitive requirements: asgiref, asyncio, aiohttp
"pulpcore>=3.49.0,<3.70",
"python-debian>=0.1.44,<0.2.0",
"python-gnupg>=0.5,<0.6",
"jsonschema>=4.6,<5.0",
]

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

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

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

[tool.towncrier]
package = "pulp_deb"
filename = "CHANGES.md"
Expand Down Expand Up @@ -47,13 +90,10 @@ underlines = ["", "", ""]

[tool.check-manifest]
ignore = [
".bumpversion.cfg",
"CHANGES/**",
"CONTRIBUTING.rst",
"dev_requirements.txt",
"doc_requirements.txt",
"docs/**",
"staging_docs/**",
"template_config.yml",
".pep8speaks.yml",
".ci/**",
Expand Down Expand Up @@ -107,4 +147,8 @@ search = "version = \"{current_version}\""
replace = "version = \"{new_version}\""

[[tool.bumpversion.files]]
filename = "./setup.py"
# This section is managed by the plugin template. Do not edit manually.

filename = "./pyproject.toml"
search = "version = \"{current_version}\""
replace = "version = \"{new_version}\""
6 changes: 0 additions & 6 deletions requirements.txt

This file was deleted.

38 changes: 0 additions & 38 deletions setup.py

This file was deleted.

0 comments on commit 30a73a0

Please sign in to comment.