Merge pull request #24 from octodns/isort

Use pyproject.toml for tooling, add isort management of imports

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # Commit that added in black formatting support
 9c732a19b014e1e41e64cd91114502e9393971e4
+# Commit for isort formatting changes
+914df67c544149aa1db6bc37bdf7d63fe944b12a

octodns_googlecloud/__init__.py

@@ -2,16 +2,16 @@
 #
 #
 
+import re
 import shlex
 import time
 from logging import getLogger
 from uuid import uuid4
-import re
 
 from google.cloud import dns
 
-from octodns.record import Record
 from octodns.provider.base import BaseProvider
+from octodns.record import Record
 
 __VERSION__ = '0.0.2'
 
@@ -53,7 +53,6 @@ def __init__(
         *args,
         **kwargs,
     ):
-
         if credentials_file:
             self.gcloud_client = dns.Client.from_service_account_json(
                 credentials_file, project=project

pyproject.toml

@@ -0,0 +1,14 @@
+[tool.black]
+line-length=80
+skip-string-normalization=true
+skip-magic-trailing-comma=true
+
+[tool.isort]
+profile = "black"
+known_first_party="octodns_googlecloud"
+known_octodns="octodns"
+line_length=80
+sections="FUTURE,STDLIB,THIRDPARTY,OCTODNS,FIRSTPARTY,LOCALFOLDER"
+
+[tool.pytest.ini_options]
+pythonpath = "."

requirements-dev.txt

@@ -1,39 +1,40 @@
 # DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
-Pygments==2.13.0
-attrs==22.1.0
-black==22.10.0
-bleach==5.0.1
-build==0.8.0
+Pygments==2.14.0
+attrs==22.2.0
+black==23.1.0
+bleach==6.0.0
+build==0.10.0
 cffi==1.15.1
 click==8.1.3
-cmarkgfm==0.8.0
-commonmark==0.9.1
-coverage==6.5.0
+cmarkgfm==2022.10.27
+coverage==7.1.0
 docutils==0.19
-exceptiongroup==1.0.0rc9
-importlib-metadata==5.0.0
-iniconfig==1.1.1
+exceptiongroup==1.1.0
+importlib-metadata==6.0.0
+iniconfig==2.0.0
+isort==5.11.5
 jaraco.classes==3.2.3
-keyring==23.9.3
+keyring==23.13.1
+markdown-it-py==2.1.0
+mdurl==0.1.2
 more-itertools==9.0.0
-mypy-extensions==0.4.3
-packaging==21.3
-pathspec==0.10.1
-pep517==0.13.0
-pkginfo==1.8.3
-platformdirs==2.5.2
+mypy-extensions==1.0.0
+packaging==23.0
+pathspec==0.11.0
+pkginfo==1.9.6
+platformdirs==2.6.2
 pluggy==1.0.0
 pycparser==2.21
-pyflakes==2.5.0
-pyparsing==3.0.9
+pyflakes==3.0.1
+pyproject_hooks==1.0.0
 pytest-cov==4.0.0
 pytest-network==0.0.1
-pytest==7.2.0
-readme-renderer==37.2
+pytest==7.2.1
+readme-renderer==37.3
 requests-toolbelt==0.10.1
 rfc3986==2.0.0
-rich==12.6.0
+rich==13.3.1
 tomli==2.0.1
-twine==4.0.1
+twine==4.0.2
 webencodings==0.5.1
-zipp==3.10.0
+zipp==3.12.0

requirements.txt

@@ -1,23 +1,23 @@
 # DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
 PyYAML==6.0
-cachetools==5.2.0
+cachetools==5.3.0
 certifi==2022.12.7
-charset-normalizer==2.1.1
-dnspython==2.2.1
+charset-normalizer==3.0.1
+dnspython==2.3.0
 fqdn==1.5.1
-google-api-core==2.10.2
-google-auth==2.13.0
+google-api-core==2.11.0
+google-auth==2.16.0
 google-cloud-core==2.3.2
 google-cloud-dns==0.34.1
-googleapis-common-protos==1.56.4
+googleapis-common-protos==1.58.0
 idna==3.4
 natsort==8.2.0
 octodns==0.9.21
 protobuf==4.21.8
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
 python-dateutil==2.8.2
-requests==2.28.1
+requests==2.28.2
 rsa==4.9
 six==1.16.0
-urllib3==1.26.12
+urllib3==1.26.14

script/coverage

@@ -24,8 +24,6 @@ grep -r -I --line-number "# pragma: +no.*cover" $SOURCE_DIR && {
 
 export GOOGLE_APPLICATION_CREDENTIALS=
 
-export PYTHONPATH=.:$PYTHONPATH
-
 pytest \
   --disable-network \
   --cov-reset \

script/format

@@ -6,4 +6,5 @@ SOURCES=$(find *.py octodns_* tests -name "*.py")
 
 . env/bin/activate
 
-black --line-length=80 --skip-string-normalization --skip-magic-trailing-comma "$@" $SOURCES
+isort "$@" $SOURCES
+black "$@" $SOURCES

script/test

@@ -16,6 +16,4 @@ fi
 
 export GOOGLE_APPLICATION_CREDENTIALS=
 
-export PYTHONPATH=.:$PYTHONPATH
-
 pytest --disable-network "$@"

setup.py

@@ -1,7 +1,8 @@
 from os import environ
-from setuptools import find_packages, setup
 from subprocess import CalledProcessError, check_output
 
+from setuptools import find_packages, setup
+
 
 def descriptions():
     with open('README.md') as fh:
@@ -43,6 +44,8 @@ def version():
         + (
             'black>=22.3.0',
             'build>=0.7.0',
+            # >=5.12.0 does not support python 3.7, we still do
+            'isort==5.11.5',
             'pyflakes>=2.2.0',
             'readme_renderer[md]>=26.0',
             'twine>=3.4.2',

tests/test_octodns_provider_googlecloud.py

@@ -2,13 +2,13 @@
 #
 #
 
-from octodns.zone import Zone
-from octodns.provider.base import Plan, BaseProvider
-
 from unittest import TestCase
-from unittest.mock import Mock, patch, PropertyMock
+from unittest.mock import Mock, PropertyMock, patch
+
+from octodns.provider.base import BaseProvider, Plan
+from octodns.record import Create, Delete, Record, Update
+from octodns.zone import Zone
 
-from octodns.record import Create, Delete, Update, Record
 from octodns_googlecloud import GoogleCloudProvider, _batched_iterator
 
 zone = Zone(name='unit.tests.', sub_zones=[])
@@ -437,7 +437,6 @@ def _get_mock_record_sets(page_token=None):
                     page_token="MOCK_PAGE_TOKEN",
                 )
             elif page_token == "MOCK_PAGE_TOKEN":
-
                 return DummyIterator(
                     [
                         DummyResourceRecordSet(*v)