Skip to content

Commit

Permalink
Merge pull request #1419 from garberg/repackage_pynipap
Browse files Browse the repository at this point in the history
WIP: Migrate pynipap to setuptools
  • Loading branch information
garberg authored Jan 16, 2025
2 parents 020cee2 + 2e2c932 commit b8fcb9f
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 29 deletions.
3 changes: 1 addition & 2 deletions pynipap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildrpm:
builddeb:
# build the source package in the parent directory
# then rename it to project_version.orig.tar.gz
$(PYTHON) setup.py sdist --dist-dir=../
$(PYTHON) -m build --sdist --outdir ../
rename -f 's/$(PROJECT)-(\d.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
# build the package
debuild -us -uc
Expand All @@ -40,7 +40,6 @@ upload:
$(PYTHON) setup.py sdist upload

clean:
$(PYTHON) setup.py clean
rm -rf .pybuild/ MANIFEST dist/ debian/files debian/python-pynipap* \
debian/python3-pynipap* debian/$(PROJECT).substvars debian/.debhelper \
debian/debhelper-build-stamp
Expand Down
1 change: 0 additions & 1 deletion pynipap/debian/compat

This file was deleted.

12 changes: 8 additions & 4 deletions pynipap/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ Source: pynipap
Maintainer: Lukas Garberg <[email protected]>
Section: python
Priority: optional
Build-Depends: debhelper (>= 10), dh-python,
python3 (>= 3.6)
Build-Depends: debhelper-compat (= 13),
dh-python,
python3-all,
python3-setuptools,
pybuild-plugin-pyproject
X-Python3-Version: >= 3.6
Standards-Version: 4.4.0
Standards-Version: 4.6.1
Homepage: https://spritelink.github.io/NIPAP/

Package: python3-pynipap
Architecture: all
Depends: ${misc:Depends}, python3 (>= 3.6)
Depends: ${misc:Depends}, ${python3:Depends}
Breaks: ${python3:Breaks}
Description: Python 3 module for accessing NIPAP
This package contains a client library for NIPAP. It's function is similar to
Expand Down
39 changes: 39 additions & 0 deletions pynipap/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[project]
name = "pynipap"
dynamic = ["version", "description"]
readme = "README.rst"
license = {text = "MIT"}
classifiers = [
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3'
]
keywords = ["nipap"]

[project.optional-dependencies]
instrumentation = [
"opentelemetry-api==1.29.0",
"opentelemetry-exporter-otlp==1.29.0",
"opentelemetry-exporter-otlp-proto-common==1.29.0",
"opentelemetry-exporter-otlp-proto-grpc==1.29.0",
"opentelemetry-exporter-otlp-proto-http==1.29.0",
"opentelemetry-proto==1.29.0",
"opentelemetry-sdk==1.29.0",
"opentelemetry-semantic-conventions==0.50b0",
"opentelemetry-util-http==0.50b0"
]

[project.urls]
Homepage = "http://SpriteLink.github.io/NIPAP"

[tool.setuptools.dynamic]
version = {attr = "pynipap.__version__"}

[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

24 changes: 2 additions & 22 deletions pynipap/setup.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,11 @@
#!/usr/bin/env python3

from distutils.core import setup
import sys

import pynipap
from setuptools import setup

long_desc = open('README.rst').read()
short_desc = long_desc.split('\n')[0].split(' - ')[1].strip()

setup(
name = 'pynipap',
version = pynipap.__version__,
description = short_desc,
long_description = long_desc,
author = pynipap.__author__,
author_email = pynipap.__author_email__,
license = pynipap.__license__,
url = pynipap.__url__,
packages = ['pynipap'],
keywords = ['nipap'],
classifiers = [
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3'
]
long_description = long_desc
)

0 comments on commit b8fcb9f

Please sign in to comment.