Merge pull request #994 from octodns/script-formatting

Include script directory in lint & formatting

requirements-dev.txt

@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
 Pygments==2.13.0
 attrs==22.1.0
 black==22.10.0

requirements.txt

@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update
 PyYAML==6.0
 dnspython==2.3.0
 fqdn==1.5.1

script/format

@@ -2,7 +2,7 @@
 
 set -e
 
-SOURCES=$(find *.py octodns tests -name "*.py")
+SOURCES="$(find *.py octodns tests -name '*.py') $(grep --files-with-matches '^#!.*python' script/*)"
 
 . env/bin/activate
 

script/lint

@@ -15,6 +15,6 @@ if [ ! -f "$ACTIVATE" ]; then
 fi
 . "$ACTIVATE"
 
-SOURCES="*.py octodns/*.py octodns/*/*.py tests/*.py"
+SOURCES="$(find *.py octodns tests -name '*.py') $(grep --files-with-matches '^#!.*python' script/*)"
 
 pyflakes $SOURCES

script/update-requirements

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
+import re
 from os.path import join
 from subprocess import check_call, check_output
+from sys import argv
 from tempfile import TemporaryDirectory
-import re
 
 
 def print_packages(packages, heading):
@@ -37,16 +38,21 @@ with TemporaryDirectory() as tmpdir:
 # pip installs the module itself along with deps so we need to get that out of
 # our list by finding the thing that was file installed during dev
 frozen = sorted([p for p in frozen if not p.startswith(our_package_name)])
-dev_frozen = sorted([p for p in dev_frozen
-                     if not p.startswith(our_package_name)])
+dev_frozen = sorted(
+    [p for p in dev_frozen if not p.startswith(our_package_name)]
+)
 
 print_packages(frozen, 'frozen')
 print_packages(dev_frozen, 'dev_frozen')
 
+script = argv[0]
+
 with open('requirements.txt', 'w') as fh:
+    fh.write(f'# DO NOT EDIT THIS FILE DIRECTLY - use {script} to update\n')
     fh.write('\n'.join(frozen))
     fh.write('\n')
 
 with open('requirements-dev.txt', 'w') as fh:
+    fh.write(f'# DO NOT EDIT THIS FILE DIRECTLY - use {script} to update\n')
     fh.write('\n'.join(dev_frozen))
     fh.write('\n')