From f58d49ac32a6a9f7ecb77c435d526b08052338d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Tue, 18 Jun 2024 12:42:42 +0200 Subject: [PATCH] Release 1.4.2 --- CHANGES | 15 +++++++++++++++ LICENSE | 2 +- debian/changelog | 17 +++++++++++++++++ debian/copyright | 4 ++-- dsc_datatool/__init__.py | 4 ++-- .../generator/client_subnet_authority.py | 2 +- dsc_datatool/generator/client_subnet_country.py | 2 +- dsc_datatool/input/dat.py | 2 +- dsc_datatool/input/xml.py | 2 +- dsc_datatool/output/influxdb.py | 2 +- dsc_datatool/output/prometheus.py | 2 +- dsc_datatool/transformer/labler.py | 2 +- dsc_datatool/transformer/net_remap.py | 2 +- dsc_datatool/transformer/re_ranger.py | 2 +- rpm/dsc-datatool.spec | 13 ++++++++++++- setup.py | 2 +- 16 files changed, 59 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index b24332f..99808c4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +2024-06-18 Jerry Lundström + + Release 1.4.2 + + This release fixes issues with IANA's IPv6 parameters file, + dsc-datatool expected a RIR in the Designation field but IANA recently + added a title for SRv6 reservation which caused an exception. + + Other updates are related to packages and GitHub workflows. + + 7560d82 Tests + 8568c84 Fix client subnet authority + a8c58a9 Workflow + fd8915c RPM SUSE + 2023-12-06 Jerry Lundström Release 1.4.1 diff --git a/LICENSE b/LICENSE index 5768f7f..6e6115d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ DSC DataTool -Copyright (c) 2016-2023 OARC, Inc. +Copyright (c) 2016-2024 OARC, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/debian/changelog b/debian/changelog index dd746e7..ffacd5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +dsc-datatool (1.4.2-1~unstable+1) unstable; urgency=low + + * Release 1.4.2 + + This release fixes issues with IANA's IPv6 parameters file, + dsc-datatool expected a RIR in the Designation field but IANA recently + added a title for SRv6 reservation which caused an exception. + + Other updates are related to packages and GitHub workflows. + + 7560d82 Tests + 8568c84 Fix client subnet authority + a8c58a9 Workflow + fd8915c RPM SUSE + + -- Jerry Lundström Tue, 18 Jun 2024 12:32:53 +0200 + dsc-datatool (1.4.1-1~unstable+1) unstable; urgency=low * Release 1.4.1 diff --git a/debian/copyright b/debian/copyright index 24c1290..5b8a832 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: dsc-datatool Source: https://github.com/DNS-OARC/dsc-datatool Files: * -Copyright: 2016-2023 OARC, Inc. +Copyright: 2016-2024 OARC, Inc. License: BSD-3-Clause Files: debian/* -Copyright: 2023 Jerry Lundström +Copyright: 2024 Jerry Lundström License: BSD-3-Clause License: BSD-3-Clause diff --git a/dsc_datatool/__init__.py b/dsc_datatool/__init__.py index 8f4f754..e12b4dc 100644 --- a/dsc_datatool/__init__.py +++ b/dsc_datatool/__init__.py @@ -29,10 +29,10 @@ class ExampleOutput(Output): def process(self, datasets) ... -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ -__version__ = '1.4.1' +__version__ = '1.4.2' import argparse import logging diff --git a/dsc_datatool/generator/client_subnet_authority.py b/dsc_datatool/generator/client_subnet_authority.py index 7706fea..2c9e919 100644 --- a/dsc_datatool/generator/client_subnet_authority.py +++ b/dsc_datatool/generator/client_subnet_authority.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import csv diff --git a/dsc_datatool/generator/client_subnet_country.py b/dsc_datatool/generator/client_subnet_country.py index 051155c..30d67ca 100644 --- a/dsc_datatool/generator/client_subnet_country.py +++ b/dsc_datatool/generator/client_subnet_country.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import maxminddb diff --git a/dsc_datatool/input/dat.py b/dsc_datatool/input/dat.py index 22d9a65..5667151 100644 --- a/dsc_datatool/input/dat.py +++ b/dsc_datatool/input/dat.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import re diff --git a/dsc_datatool/input/xml.py b/dsc_datatool/input/xml.py index ae415da..bb8c0ff 100644 --- a/dsc_datatool/input/xml.py +++ b/dsc_datatool/input/xml.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import logging diff --git a/dsc_datatool/output/influxdb.py b/dsc_datatool/output/influxdb.py index 1192563..bb4d2e6 100644 --- a/dsc_datatool/output/influxdb.py +++ b/dsc_datatool/output/influxdb.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import re diff --git a/dsc_datatool/output/prometheus.py b/dsc_datatool/output/prometheus.py index cf5011f..c3f2dfb 100644 --- a/dsc_datatool/output/prometheus.py +++ b/dsc_datatool/output/prometheus.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import re diff --git a/dsc_datatool/transformer/labler.py b/dsc_datatool/transformer/labler.py index 3ad273c..e510511 100644 --- a/dsc_datatool/transformer/labler.py +++ b/dsc_datatool/transformer/labler.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import yaml diff --git a/dsc_datatool/transformer/net_remap.py b/dsc_datatool/transformer/net_remap.py index 844d843..01a9aa5 100644 --- a/dsc_datatool/transformer/net_remap.py +++ b/dsc_datatool/transformer/net_remap.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import ipaddress diff --git a/dsc_datatool/transformer/re_ranger.py b/dsc_datatool/transformer/re_ranger.py index 28840e0..b2d3691 100644 --- a/dsc_datatool/transformer/re_ranger.py +++ b/dsc_datatool/transformer/re_ranger.py @@ -4,7 +4,7 @@ Part of dsc_datatool. -:copyright: 2023 OARC, Inc. +:copyright: 2024 OARC, Inc. """ import re diff --git a/rpm/dsc-datatool.spec b/rpm/dsc-datatool.spec index 83d23db..6863b87 100644 --- a/rpm/dsc-datatool.spec +++ b/rpm/dsc-datatool.spec @@ -1,5 +1,5 @@ Name: dsc-datatool -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: Export DSC data to other formats and/or databases Group: Productivity/Networking/DNS/Utilities @@ -93,6 +93,17 @@ install -m644 man/man7/dsc-datatool-transformer-netremap.7 %{buildroot}%{_mandir %changelog +* Tue Jun 18 2024 Jerry Lundström 1.4.2-1 +- Release 1.4.2 + * This release fixes issues with IANA's IPv6 parameters file, + dsc-datatool expected a RIR in the Designation field but IANA recently + added a title for SRv6 reservation which caused an exception. + * Other updates are related to packages and GitHub workflows. + * Commits: + 7560d82 Tests + 8568c84 Fix client subnet authority + a8c58a9 Workflow + fd8915c RPM SUSE * Wed Dec 06 2023 Jerry Lundström 1.4.1-1 - Release 1.4.1 * This release fixes issue with InfluxDB quoting, was missing to quote diff --git a/setup.py b/setup.py index abf72a6..7970564 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='dsc_datatool', - version='1.4.1', + version='1.4.2', packages=find_packages(), include_package_data=True, zip_safe=False,