Fixing up some format strings in nox configs.

dhermes · dhermes · commit 073b74ebabad · 2017-03-27T10:20:16.000-07:00
Using `STRING_TEMPLATE % VARIABLE` can introduce hard-to-find bugs
if `VARIABLE` is expected to be a string but ends up being a tuple.
Instead of using percent formatting, just using `.format`.

Also making tweaks to `get_target_packages` to make some path
manipulation / checks OS-independent.
diff --git a/bigquery/nox.py b/bigquery/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/bigtable/nox.py b/bigtable/nox.py
@@ -24,7 +24,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -48,7 +48,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/core/nox.py b/core/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov',
diff --git a/datastore/nox.py b/datastore/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/dns/nox.py b/dns/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
diff --git a/language/nox.py b/language/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/logging/nox.py b/logging/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/monitoring/nox.py b/monitoring/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/pubsub/nox.py b/pubsub/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/resource_manager/nox.py b/resource_manager/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
diff --git a/runtimeconfig/nox.py b/runtimeconfig/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
diff --git a/spanner/nox.py b/spanner/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/speech/nox.py b/speech/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/storage/nox.py b/storage/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/test_utils/scripts/get_target_packages.py b/test_utils/scripts/get_target_packages.py
@@ -54,8 +54,8 @@ def get_baseline():
         os.environ.get('CIRCLE_PR_NUMBER', ''),
     ])
     if ci_non_master:
-        subprocess.run(['git', 'remote', 'add', 'baseline',
-                        'git@github.com:GoogleCloudPlatform/%s' % GITHUB_REPO],
+        repo_url = 'git@github.com:GoogleCloudPlatform/{}'.format(GITHUB_REPO)
+        subprocess.run(['git', 'remote', 'add', 'baseline', repo_url],
                         stderr=subprocess.DEVNULL)
         subprocess.run(['git', 'pull', 'baseline'], stderr=subprocess.DEVNULL)
         return 'baseline/master'
@@ -91,7 +91,7 @@ def get_changed_files():
     # Return a list of altered files.
     try:
         return subprocess.check_output([
-            'git', 'diff', '--name-only', '%s..HEAD' % baseline,
+            'git', 'diff', '--name-only', '{}..HEAD'.format(baseline),
         ], stderr=subprocess.DEVNULL).decode('utf8').strip().split('\n')
     except subprocess.CalledProcessError:
         warnings.warn('Unable to perform git diff; falling back to assuming '
@@ -109,7 +109,8 @@ def get_changed_packages(file_list):
     all_packages = set()
     for file_ in os.listdir(BASE_DIR):
         abs_file = os.path.realpath(os.path.join(BASE_DIR, file_))
-        if os.path.isdir(abs_file) and os.path.isfile('%s/nox.py' % abs_file):
+        nox_file = os.path.join(abs_file, 'nox.py')
+        if os.path.isdir(abs_file) and os.path.isfile(nox_file):
             all_packages.add(file_)
 
     # If ther is no file list, send down the full package set.
@@ -120,11 +121,11 @@ def get_changed_packages(file_list):
     answer = set()
     for file_ in file_list:
         # Ignore root directory changes (setup.py, .gitignore, etc.).
-        if '/' not in file_:
+        if os.path.sep not in file_:
             continue
 
         # Ignore changes that are not in a package (usually this will be docs).
-        package = file_.split('/')[0]
+        package = file_.split(os.path.sep, 1)[0]
         if package not in all_packages:
             continue
 
@@ -142,8 +143,12 @@ def get_changed_packages(file_list):
     return answer
 
 
-if __name__ == '__main__':
-    # Figure out what packages have changed.
+def main():
+    """Figure out what packages have changed."""
     file_list = get_changed_files()
     for package in sorted(get_changed_packages(file_list)):
         print(package)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/translate/nox.py b/translate/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
diff --git a/vision/nox.py b/vision/nox.py
@@ -25,7 +25,7 @@ def unit_tests(session, python_version):
     """Run the unit test suite."""
 
     # Run unit tests against all supported versions of Python.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package in-place.
     session.install('mock', 'pytest', 'pytest-cov', '../core/')
@@ -49,7 +49,7 @@ def system_tests(session, python_version):
         return
 
     # Run the system tests against latest Python 2 and Python 3 only.
-    session.interpreter = 'python%s' % python_version
+    session.interpreter = 'python{}'.format(python_version)
 
     # Install all test dependencies, then install this package into the
     # virutalenv's dist-packages.
