From c0e38d67f7fb053b1d5d829cd9078ab8af46a9ab Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Tue, 1 Feb 2022 07:20:24 -0800
Subject: [PATCH 1/2] pycountry is only a dev requirement in core now

---
 requirements-dev.txt | 3 ++-
 requirements.txt     | 3 +--
 setup.py             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 49b8f4c..597ada6 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,7 +4,7 @@ bleach==4.1.0
 build==0.7.0
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.10
+charset-normalizer==2.0.11
 cmarkgfm==0.6.0
 colorama==0.4.4
 coverage==6.3
@@ -21,6 +21,7 @@ pprintpp==0.4.0
 py==1.11.0
 pycodestyle==2.8.0
 pycountry-convert==0.7.2
+pycountry==22.1.10
 pycparser==2.21
 pyflakes==2.4.0
 pyparsing==3.0.7
diff --git a/requirements.txt b/requirements.txt
index 0d9b90a..488578d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 PyYAML==6.0
 dnspython==2.2.0
 fqdn==1.5.1
-natsort==8.0.2
-pycountry==22.1.10
+natsort==8.1.0
 python-dateutil==2.8.2
 six==1.16.0
diff --git a/setup.py b/setup.py
index eb97c92..9438e0f 100644
--- a/setup.py
+++ b/setup.py
@@ -71,6 +71,7 @@ setup(
         'dev': tests_require + (
             'build>=0.7.0',
             'pycodestyle>=2.6.0',
+            'pycountry>=19.8.18',
             'pycountry-convert>=0.7.2',
             'pyflakes>=2.2.0',
             'readme_renderer[md]>=26.0',
@@ -82,7 +83,6 @@ setup(
         'dnspython>=1.15.0',
         'fqdn>=1.5.0',
         'natsort>=5.5.0',
-        'pycountry>=19.8.18',
         'python-dateutil>=2.8.1',
     ),
     license='MIT',

From 86b4c386a40b70dab4d6b774348c65a94288d6d2 Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Tue, 1 Feb 2022 07:27:11 -0800
Subject: [PATCH 2/2] Add a changelog entry about requirements updates

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e3612c..397f808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,10 @@
    * [SelectelProvider](https://github.com/octodns/octodns-selectel/)
    * [TransipProvider](https://github.com/octodns/octodns-transip/)
    * [UltraDnsProvider](https://github.com/octodns/octodns-ultradns/)
+* As part of the extraction work octoDNS's requirements (setup.py and .txt
+  files) have been updated and minimized and a helper script,
+  script/update-requirements has been added to help manage the txt files going
+  forward.
 * NS1 provider has received improvements to the dynamic record implementation.
   As a result, if octoDNS is downgraded from this version, any dynamic records
   created or updated using this version will show an update.