diff --git a/.gitignore b/.gitignore index f9b829abd..7d48fab57 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ *.tar.gz *.deb docs/sphinx/_build/ +nipap-www/nipap_www.egg-info +nipap/nipap.egg-info diff --git a/nipap-cli/Makefile b/nipap-cli/Makefile index 6a7b5a9a9..0fe853df3 100644 --- a/nipap-cli/Makefile +++ b/nipap-cli/Makefile @@ -45,7 +45,7 @@ clean: rm -rf .pybuild/ MANIFEST dist/ debian/tmp debian/$(PROJECT) debian/files \ .pc/ debian/$(PROJECT).debhelper.log debian/$(PROJECT).postinst.debhelper \ debian/$(PROJECT).prerm.debhelper debian/$(PROJECT).substvars nipap.1 \ - debian/.debhelper + debian/.debhelper debian/debhelper-build-stamp find . -name '*.pyc' -delete VER := $(shell head -n1 ../NEWS | awk '{print $$2}') diff --git a/nipap-cli/debian/changelog b/nipap-cli/debian/changelog index 0f98e600f..939ff25cb 100644 --- a/nipap-cli/debian/changelog +++ b/nipap-cli/debian/changelog @@ -152,7 +152,7 @@ nipap-cli (0.29.4-1) stable; urgency=medium * Improved logging in backend (#1043, #1047) * WSGI file moved to /etc/nipap/www (#880, #1052) - -- Lukas Garberg Mon, 26 Sep 2016 06:57:23 +0200 + -- Lukas Garberg Mon, 26 Sep 2016 06:57:23 +0200 nipap-cli (0.29.3-1) stable; urgency=medium @@ -173,7 +173,7 @@ nipap-cli (0.29.2-1) stable; urgency=medium #1005) * Fix error handling in nipap-www (#1004, #1006) - -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 + -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 nipap-cli (0.29.1-1) stable; urgency=medium diff --git a/nipap-cli/debian/control b/nipap-cli/debian/control index 782f48d83..09397b86d 100644 --- a/nipap-cli/debian/control +++ b/nipap-cli/debian/control @@ -2,7 +2,7 @@ Source: nipap-cli Maintainer: Lukas Garberg Section: python Priority: optional -Build-Depends: python3 (>= 3.1), dh-python, debhelper (>= 9), python3-setuptools +Build-Depends: python3 (>= 3.1), dh-python, debhelper (>= 10), python3-setuptools Standards-Version: 4.4.0 Package: nipap-cli diff --git a/nipap-www/Makefile b/nipap-www/Makefile index d7580bb2e..710b76459 100644 --- a/nipap-www/Makefile +++ b/nipap-www/Makefile @@ -42,8 +42,8 @@ upload: clean: $(PYTHON) setup.py clean - rm -rf build/ MANIFEST dist/ debian/$(PROJECT)* debian/files .pc/ debian/patches \ - debian/.debhelper + rm -rf .pybuild/ MANIFEST dist/ debian/$(PROJECT)* debian/files .pc/ debian/patches \ + debian/.debhelper nipap_www.egg-info debian/debhelper-build-stamp find . -name '*.pyc' -delete rm -rf data/sessions/container_file/* rm -rf data/sessions/container_file_lock/* diff --git a/nipap-www/debian/changelog b/nipap-www/debian/changelog index 0bd0fa5bb..a583eb3c9 100644 --- a/nipap-www/debian/changelog +++ b/nipap-www/debian/changelog @@ -152,7 +152,7 @@ nipap-www (0.29.4-1) stable; urgency=medium * Improved logging in backend (#1043, #1047) * WSGI file moved to /etc/nipap/www (#880, #1052) - -- Lukas Garberg Mon, 26 Sep 2016 06:57:22 +0200 + -- Lukas Garberg Mon, 26 Sep 2016 06:57:22 +0200 nipap-www (0.29.3-1) stable; urgency=medium @@ -173,7 +173,7 @@ nipap-www (0.29.2-1) stable; urgency=medium #1005) * Fix error handling in nipap-www (#1004, #1006) - -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 + -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 nipap-www (0.29.1-1) stable; urgency=medium diff --git a/nipap-www/debian/control b/nipap-www/debian/control index 51c711924..b56596cd6 100644 --- a/nipap-www/debian/control +++ b/nipap-www/debian/control @@ -2,7 +2,7 @@ Source: nipap-www Section: web Priority: optional Maintainer: Lukas Garberg -Build-Depends: debhelper (>= 5.0.38), debhelper (>= 7), python3 (>= 3.6), python3-setuptools (>= 0.6b3), dh-python +Build-Depends: debhelper (>= 10), python3 (>= 3.6), python3-setuptools (>= 0.6b3), dh-python Standards-Version: 4.4.0 Package: nipap-www diff --git a/nipap-www/nipap_www.egg-info/PKG-INFO b/nipap-www/nipap_www.egg-info/PKG-INFO deleted file mode 100644 index 8eb4001d9..000000000 --- a/nipap-www/nipap_www.egg-info/PKG-INFO +++ /dev/null @@ -1,12 +0,0 @@ -Metadata-Version: 2.1 -Name: nipap-www -Version: 0.32.4 -Summary: web frontend for NIPAP -Home-page: http://SpriteLink.github.io/NIPAP -Author: Kristian Larsson, Lukas Garberg -Author-email: kll@tele2.net, lukas@spritelink.net -License: MIT -Platform: UNKNOWN - -UNKNOWN - diff --git a/nipap-www/nipap_www.egg-info/dependency_links.txt b/nipap-www/nipap_www.egg-info/dependency_links.txt deleted file mode 100644 index 8b1378917..000000000 --- a/nipap-www/nipap_www.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nipap-www/nipap_www.egg-info/not-zip-safe b/nipap-www/nipap_www.egg-info/not-zip-safe deleted file mode 100644 index 8b1378917..000000000 --- a/nipap-www/nipap_www.egg-info/not-zip-safe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nipap-www/nipap_www.egg-info/paster_plugins.txt b/nipap-www/nipap_www.egg-info/paster_plugins.txt deleted file mode 100644 index c24c7feaa..000000000 --- a/nipap-www/nipap_www.egg-info/paster_plugins.txt +++ /dev/null @@ -1,2 +0,0 @@ -PasteScript -Pylons diff --git a/nipap-www/nipap_www.egg-info/requires.txt b/nipap-www/nipap_www.egg-info/requires.txt deleted file mode 100644 index 560bedd94..000000000 --- a/nipap-www/nipap_www.egg-info/requires.txt +++ /dev/null @@ -1,3 +0,0 @@ -Flask -nipap -pynipap diff --git a/nipap-www/nipap_www.egg-info/top_level.txt b/nipap-www/nipap_www.egg-info/top_level.txt deleted file mode 100644 index 9fea4e956..000000000 --- a/nipap-www/nipap_www.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -nipapwww diff --git a/nipap-www/requirements.txt b/nipap-www/requirements.txt index 33790c3e1..d37d9c30f 100644 --- a/nipap-www/requirements.txt +++ b/nipap-www/requirements.txt @@ -1,4 +1,20 @@ -Flask -Jinja2 +Flask==2.1.3 +Jinja2==3.1.4 pynipap nipap + +# optional dependencies below +opentelemetry-api==1.24.0 +opentelemetry-exporter-otlp==1.24.0 +opentelemetry-exporter-otlp-proto-common==1.24.0 +opentelemetry-exporter-otlp-proto-grpc==1.24.0 +opentelemetry-exporter-otlp-proto-http==1.24.0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-dbapi==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-psycopg2==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-proto==1.24.0 +opentelemetry-sdk==1.24.0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 diff --git a/nipap/Makefile b/nipap/Makefile index 1b3baea3d..91097cdcf 100644 --- a/nipap/Makefile +++ b/nipap/Makefile @@ -42,7 +42,7 @@ upload: clean: $(PYTHON) setup.py clean - rm -rf build/ MANIFEST dist/ debian/tmp debian/nipap-common \ + rm -rf .pybuild/ MANIFEST dist/ debian/tmp debian/nipap-common \ debian/$(PROJECT) debian/nipapd debian/files .pc/ nipapd.8* \ nipap-passwd.1* debian/nipapd.debhelper.log \ debian/nipapd.postinst.debhelper debian/nipapd.postrm.debhelper \ @@ -50,7 +50,7 @@ clean: debian/nipap-common.debhelper.log \ debian/nipap-common.postinst.debhelper \ debian/nipap-common.prerm.debhelper debian/nipap-common.substvars \ - debian/.debhelper + debian/.debhelper debian/debhelper-build-stamp nipap.egg-info/ find . -name '*.pyc' -delete VER := $(shell head -n1 ../NEWS | awk '{print $$2}') diff --git a/nipap/debian/changelog b/nipap/debian/changelog index 2563c0b9e..17164e9f4 100644 --- a/nipap/debian/changelog +++ b/nipap/debian/changelog @@ -152,7 +152,7 @@ nipap (0.29.4-1) stable; urgency=medium * Improved logging in backend (#1043, #1047) * WSGI file moved to /etc/nipap/www (#880, #1052) - -- Lukas Garberg Mon, 26 Sep 2016 06:57:19 +0200 + -- Lukas Garberg Mon, 26 Sep 2016 06:57:19 +0200 nipap (0.29.3-1) stable; urgency=medium @@ -173,7 +173,7 @@ nipap (0.29.2-1) stable; urgency=medium #1005) * Fix error handling in nipap-www (#1004, #1006) - -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 + -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 nipap (0.29.1-1) stable; urgency=medium diff --git a/nipap/debian/control b/nipap/debian/control index 8a415c35d..d1bdf2322 100644 --- a/nipap/debian/control +++ b/nipap/debian/control @@ -2,7 +2,7 @@ Source: nipap Maintainer: Lukas Garberg Section: python Priority: optional -Build-Depends: python3 (>= 3.6), debhelper (>= 7.4.3), dh-python +Build-Depends: python3 (>= 3.6), debhelper (>= 10), dh-python Standards-Version: 4.4.0 diff --git a/pynipap/Makefile b/pynipap/Makefile index 343a26767..bb36dfbea 100644 --- a/pynipap/Makefile +++ b/pynipap/Makefile @@ -42,7 +42,8 @@ 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/python3-pynipap* debian/$(PROJECT).substvars debian/.debhelper \ + debian/debhelper-build-stamp find . -name '*.pyc' -delete VER := $(shell head -n1 ../NEWS | awk '{print $$2}') diff --git a/pynipap/debian/changelog b/pynipap/debian/changelog index f076c59ef..1d56449cd 100644 --- a/pynipap/debian/changelog +++ b/pynipap/debian/changelog @@ -152,7 +152,7 @@ pynipap (0.29.4-1) stable; urgency=medium * Improved logging in backend (#1043, #1047) * WSGI file moved to /etc/nipap/www (#880, #1052) - -- Lukas Garberg Mon, 26 Sep 2016 06:57:20 +0200 + -- Lukas Garberg Mon, 26 Sep 2016 06:57:20 +0200 pynipap (0.29.3-1) stable; urgency=medium @@ -173,7 +173,7 @@ pynipap (0.29.2-1) stable; urgency=medium #1005) * Fix error handling in nipap-www (#1004, #1006) - -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 + -- Kristian Larsson Fri, 09 Sep 2016 17:45:14 +0200 pynipap (0.29.1-1) stable; urgency=medium diff --git a/pynipap/debian/control b/pynipap/debian/control index 14d9cd0c0..565cdb4b0 100644 --- a/pynipap/debian/control +++ b/pynipap/debian/control @@ -2,7 +2,7 @@ Source: pynipap Maintainer: Lukas Garberg Section: python Priority: optional -Build-Depends: debhelper (>= 8), dh-python, +Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.6) X-Python3-Version: >= 3.6 Standards-Version: 4.4.0 diff --git a/utilities/news2dch.py b/utilities/news2dch.py index fb3c3df3a..5d9e4de29 100755 --- a/utilities/news2dch.py +++ b/utilities/news2dch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Copy content of NEWS file into dch file. diff --git a/whoisd/Makefile b/whoisd/Makefile index 2c4772993..80899362b 100644 --- a/whoisd/Makefile +++ b/whoisd/Makefile @@ -41,10 +41,11 @@ upload: clean: $(PYTHON) setup.py clean - rm -rf build/ MANIFEST dist/ debian/tmp debian/$(PROJECT) debian/files \ + rm -rf .pybuild/ MANIFEST dist/ debian/tmp debian/$(PROJECT) debian/files \ .pc/ debian/$(PROJECT).debhelper.log debian/$(PROJECT).postinst.debhelper \ debian/$(PROJECT).prerm.debhelper debian/$(PROJECT).postrm.debhelper \ - debian/$(PROJECT).substvars nipap-whoisd.8 debian/.debhelper + debian/$(PROJECT).substvars nipap-whoisd.8 debian/.debhelper \ + debian/debhelper-build-stamp find . -name '*.pyc' -delete VER := $(shell head -n1 ../NEWS | awk '{print $$2}') diff --git a/whoisd/debian/changelog b/whoisd/debian/changelog index 651ef1ddf..a21a78093 100644 --- a/whoisd/debian/changelog +++ b/whoisd/debian/changelog @@ -152,7 +152,7 @@ nipap-whoisd (0.29.4-1) stable; urgency=medium * Improved logging in backend (#1043, #1047) * WSGI file moved to /etc/nipap/www (#880, #1052) - -- Lukas Garberg Mon, 26 Sep 2016 06:57:24 +0200 + -- Lukas Garberg Mon, 26 Sep 2016 06:57:24 +0200 nipap-whoisd (0.29.3-1) stable; urgency=medium @@ -173,7 +173,7 @@ nipap-whoisd (0.29.2-1) stable; urgency=medium #1005) * Fix error handling in nipap-www (#1004, #1006) - -- Kristian Larsson Fri, 09 Sep 2016 17:45:15 +0200 + -- Kristian Larsson Fri, 09 Sep 2016 17:45:15 +0200 nipap-whoisd (0.29.1-1) stable; urgency=medium diff --git a/whoisd/debian/control b/whoisd/debian/control index 324d4a1c8..1af50d12c 100644 --- a/whoisd/debian/control +++ b/whoisd/debian/control @@ -2,7 +2,7 @@ Source: nipap-whoisd Maintainer: Kristian Larsson Section: python Priority: optional -Build-Depends: python3 (>= 3.6), debhelper (>= 7), dh-python +Build-Depends: python3 (>= 3.6), debhelper (>= 10), dh-python Standards-Version: 4.4.0 Package: nipap-whoisd