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 to pyproject.toml #283

Merged
merged 5 commits into from
Sep 17, 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
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v3
- name: Prepare virtual environment
run: make install-dev
run: make install-test
working-directory: dim-testsuite
- name: Create DIM configuration directory
run: mkdir -p /etc/dim
Expand Down
4 changes: 4 additions & 0 deletions dim-testsuite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ install-dev: install-deps-local-editable
${VPIP} install -r ../dim/requirements-dev.txt
${VPIP} install -r ../ndcli/requirements-dev.txt

install-test: install
${VPIP} install -r ../dim/requirements-dev.txt
${VPIP} install -r ../ndcli/requirements-dev.txt

db-clear:
FLASK_APP=${FLASK_APP} ${VDIR}/bin/flask db clear

Expand Down
7 changes: 7 additions & 0 deletions dim/dim/cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import click
import dim
from flask.cli import FlaskGroup

@click.group(cls=FlaskGroup, create_app=dim.create_app)
def cli():
print("For output check your syslog output")
53 changes: 53 additions & 0 deletions dim/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[project]
name = "dimserver"
version = "5.0.2"
maintainers = [
{ name = "zerimond" },
]
description = "DNS and IP management Python server"
requires-python = ">=3.9"
dependencies=[
"mysqlclient>=1.4.6",
"SQLAlchemy~=1.4",
"ldap3~=2.9",
"Flask~=2.1",
"Flask-SQLAlchemy~=2.5",
"Jinja2~=3.1",
"dnspython~=2.1,!=2.2.0",
"requests~=2.27",
"pycryptodome~=3.14",
"gunicorn>=21",
]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]

[project.optional-dependencies]
docs = [
"nose~=1.3",
"nose-ignore-docstring~=0.2",
"pytest~=7.1",
"pytest-cov~=3.0",
"Sphinx~=4.4",
]

[project.urls]
Homepage = "https://github.com/ionos-cloud/dim"
Issues = "https://github.com/ionos-cloud/dim/issues"

[project.scripts]
dim = "dim.cli:cli"

[tool.setuptools.packages.find]
exclude = ["doc", "etc"]


[tool.setuptools]
script-files = ["report", "manage_db", "manage_dim"]

[tool.setuptools.package-data]
dim = ["sql/*.sql", "../etc/*"]
6 changes: 0 additions & 6 deletions dim/setup.cfg

This file was deleted.

8 changes: 0 additions & 8 deletions dim/setup.py

This file was deleted.

20 changes: 20 additions & 0 deletions dimclient/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[project]
name = "dimclient"
version = "1.0.1"
maintainers = [
{ name = "zerimond" },
]
description = "DNS and IP management Python library"
readme = "README.md"
requires-python = ">=3.6"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]

[project.urls]
Homepage = "https://github.com/ionos-cloud/dim"
Issues = "https://github.com/ionos-cloud/dim/issues"
2 changes: 0 additions & 2 deletions dimclient/setup.cfg

This file was deleted.

6 changes: 0 additions & 6 deletions dimclient/setup.py

This file was deleted.

34 changes: 34 additions & 0 deletions ndcli/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[project]
name = "dimclient-cli"
version = "5.0.2"
maintainers = [
{ name = "zerimond" },
]
description = "DNS and IP management Python CLI client"
readme = "README.md"
dependencies = [
"dimclient",
"python-dateutil>=1.4.1",
"dnspython>=1.12.0,!=2.2.0",
]
requires-python = ">=3.6"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: System Administrators",
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]

[project.optional-dependencies]
docs = [
"Sphinx~=4.4",
"hypothesis~=5.6.0",
]

[project.scripts]
ndcli = "dimcli:main"

[project.urls]
Homepage = "https://github.com/ionos-cloud/dim"
Issues = "https://github.com/ionos-cloud/dim/issues"
10 changes: 0 additions & 10 deletions ndcli/setup.py

This file was deleted.

Loading