!38 update to 2.3.0

From: @eaglegai 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2023-03-13 01:51:32 +00:00 committed by Gitee
commit 5a78b96c4a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 6 additions and 149 deletions

View File

@ -1,16 +0,0 @@
From 7c186aa1edf22cb77f8000c95a2e937813982a04 Mon Sep 17 00:00:00 2001
From: Bob Halley <halley@dnspython.org>
Date: Tue, 18 Jan 2022 12:41:55 -0800
Subject: [PATCH] fix win32util.py file mode
---
dns/win32util.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 dns/win32util.py
diff --git a/dns/win32util.py b/dns/win32util.py
old mode 100755
new mode 100644
--
2.33.0

View File

@ -1,25 +0,0 @@
From 53fb24527687399bd3eeae7670ba7df2dd5c280e Mon Sep 17 00:00:00 2001
From: Bob Halley <halley@dnspython.org>
Date: Mon, 21 Feb 2022 14:32:25 -0800
Subject: [PATCH] update README w/ codecov and lgtm
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 81503f3..2344807 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
[![Documentation Status](https://readthedocs.org/projects/dnspython/badge/?version=latest)](https://dnspython.readthedocs.io/en/latest/?badge=latest)
[![PyPI version](https://badge.fury.io/py/dnspython.svg)](https://badge.fury.io/py/dnspython)
[![License: ISC](https://img.shields.io/badge/License-ISC-brightgreen.svg)](https://opensource.org/licenses/ISC)
+[![Coverage](https://codecov.io/github/rthalley/dnspython/coverage.svg?branch=master)](https://codecov.io/github/rthalley/dnspython)
+[![LGTM Grade](https://img.shields.io/lgtm/grade/python/github/rthalley/dnspython)](https://img.shields.io/lgtm/grade/python/github/rthalley/dnspython)
## INTRODUCTION
--
2.33.0

View File

@ -1,21 +0,0 @@
From a4e88cfb2dcb98c589bbc1eb7452c773faf46398 Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Thu, 27 Oct 2022 23:07:17 +0800
Subject: [PATCH] fix missing version in setup.cfg
Signed-off-by: eaglegai <eaglegai@163.com>
---
setup.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.cfg b/setup.cfg
index a32ff8ce..cc7e3b0d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,6 @@
[metadata]
name = dnspython
+version = 2.2.1
author = Bob Halley
author_email = halley@dnspython.org
license = ISC

Binary file not shown.

BIN
dnspython-2.3.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,79 +0,0 @@
From e691f1219550ccda24276cbfffff5cf0d31d91d1 Mon Sep 17 00:00:00 2001
From: yangl777 <1525652683@qq.com>
Date: Tue, 17 Nov 2020 10:36:08 +0800
Subject: [PATCH] fix-failed-tests
---
tests/test_resolver.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 1738c1a..1e0c727 100644
--- a/tests/test_resolver.py
+++ b/tests/test_resolver.py
@@ -31,11 +31,7 @@ from dns._compat import xrange, PY3
# Some tests require the internet to be available to run, so let's
# skip those if it's not there.
-_network_available = True
-try:
- socket.gethostbyname('dnspython.org')
-except socket.gaierror:
- _network_available = False
+_network_available = False
# Some tests use a "nano nameserver" for testing. It requires trio
# and threading, so try to import it and if it doesn't work, skip
diff -ruNa dnspython-2.1.0-org/tests/test_resolver_override.py dnspython-2.1.0/tests/test_resolver_override.py
--- dnspython-2.1.0-org/tests/test_resolver_override.py 2021-07-07 10:04:01.861405149 +0800
+++ dnspython-2.1.0/tests/test_resolver_override.py 2021-07-07 10:04:59.981489084 +0800
@@ -11,11 +11,7 @@ import dns.resolver
# Some tests require the internet to be available to run, so let's
# skip those if it's not there.
-_network_available = True
-try:
- socket.gethostbyname('dnspython.org')
-except socket.gaierror:
- _network_available = False
+_network_available = False
@unittest.skipIf(not _network_available, "Internet not reachable")
diff -ruNa dnspython-2.1.0-org/tests/test_async.py dnspython-2.1.0/tests/test_async.py
--- dnspython-2.1.0-org/tests/test_async.py 2021-07-07 10:04:01.861405149 +0800
+++ dnspython-2.1.0/tests/test_async.py 2021-07-07 10:04:59.981489084 +0800
@@ -41,12 +41,8 @@
# Some tests require the internet to be available to run, so let's
# skip those if it's not there.
-_network_available = True
-try:
- socket.gethostbyname('dnspython.org')
-except socket.gaierror:
- _network_available = False
+_network_available = False
# Look for systemd-resolved, as it does dangling CNAME responses incorrectly.
#
diff -ruNa dnspython-2.1.0-org/tests/test_query.py dnspython-2.1.0/tests/test_query.py
--- dnspython-2.1.0-org/tests/test_query.py 2021-07-07 10:04:01.861405149 +0800
+++ dnspython-2.1.0/tests/test_query.py 2021-07-07 10:05:44.431553273 +0800
@@ -38,11 +38,8 @@
# Some tests require the internet to be available to run, so let's
# skip those if it's not there.
-_network_available = True
-try:
- socket.gethostbyname('dnspython.org')
-except socket.gaierror:
- _network_available = False
+
+_network_available = False
# Some tests use a "nano nameserver" for testing. It requires trio
# and threading, so try to import it and if it doesn't work, skip
--
1.8.3.1

View File

@ -13,17 +13,12 @@ messages, names, and records.
Name: python-dns Name: python-dns
Summary: %{sum} Summary: %{sum}
Version: 2.2.1 Version: 2.3.0
Release: 3 Release: 1
License: ISC and MIT License: ISC and MIT
URL: http://www.dnspython.org/ URL: http://www.dnspython.org/
Source0: https://github.com/rthalley/dnspython/archive/v%{version}/dnspython-%{version}.tar.gz Source0: https://github.com/rthalley/dnspython/archive/v%{version}/dnspython-%{version}.tar.gz
Patch0: fix-failed-tests.patch
Patch1: backport-fix-missing-version-in-setup.cfg.patch
Patch2: 0001-fix-win32util.py-file-mode.patch
Patch3: 0001-update-README-w-codecov-and-lgtm.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel python3-setuptools python3-cryptography BuildRequires: python3-devel python3-setuptools python3-cryptography
@ -47,7 +42,7 @@ Requires: python3-cryptography
find examples -type f | xargs chmod a-x find examples -type f | xargs chmod a-x
%build %build
sed -i 's/setup_requires = setuptools>=44; wheel; setuptools_scm\[toml\]>=3.4.3/setup_requires = setuptools>=44;/' setup.cfg sed -i 's/setup_requires = setuptools>=44; setuptools_scm\[toml\]>=3.4.3/setup_requires = setuptools>=44;/' setup.cfg
%py3_build %py3_build
%install %install
@ -65,6 +60,9 @@ pytest
%doc examples %doc examples
%changelog %changelog
* Sat Mar 11 2023 gaihuiying <eaglegai@163.com> - 2.3.0-1
- update to 2.3.0
* Fri Jan 13 2023 caofei <caofei@xfusion.com> - 2.2.1-3 * Fri Jan 13 2023 caofei <caofei@xfusion.com> - 2.2.1-3
- update README w/ codecov and lgtm - update README w/ codecov and lgtm