From 9eec4cc2e10fd83c42f6e29eaccd54682f75c157 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 19 Nov 2020 10:12:52 +0100 Subject: [PATCH] Merge #20288: script, doc: contrib/seeds updates 961f148cb1b4caab86b4354357999e03433b04b1 doc: update contrib/seeds/README dnspython installation info (Jon Atack) dd7b5f46d85401254630abf6976f59b5b8eed181 script: fix deprecation warning in makeseeds.py (Jon Atack) Pull request description: Seen while reviewing #20237. 1. Fix a deprecation warning in `contrib/seeds/makeseeds.py` ``` makeseeds.py:139: DeprecationWarning: please use dns.resolver.resolve() instead asn = int([x.to_text() for x in dns.resolver.query('.'.join( ``` - Per https://dnspython.readthedocs.io/en/latest/whatsnew.html, `dns.resolver.query()` was deprecated in `dnspython` version 2.0.0. - See https://dnspython.readthedocs.io/en/latest/resolver-class.html for more info on the resolver class. 2. Update the `dnspython` dependency installation instructions in `contrib/seeds/README` - The markdown rendering can be seen here: https://github.com/jonatack/bitcoin/tree/contrib-seeds-fixups/contrib/seeds ACKs for top commit: laanwj: code review ACK 961f148cb1b4caab86b4354357999e03433b04b1 Tree-SHA512: f9c4f318a1a0d35b8de147d24b72c534a1f58eece31e7cfa00b4149a63b6a618d8ca0312f52fd8056f3c645cf2ee68574ca02319fddffdad919a70cd33395d33 --- contrib/seeds/README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 85dfaa8d12..c4b678604c 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -26,7 +26,12 @@ that the list is as expected. ## Dependencies -Ubuntu: +Ubuntu, Debian: - sudo apt-get install python3-pip - pip3 install dnspython + sudo apt-get install python3-dnspython + +and/or for other operating systems: + + pip3 install dnspython3 + +See https://dnspython.readthedocs.io/en/latest/installation.html for more information.