tests: fix tests & linting

.circleci/config.yml

@@ -49,7 +49,9 @@ workflows:
   lint:
     jobs:
       - linter/pre-commit:
-          python_version: 3.10.0
+          # N.B. lowest common denominator, don't want to error on not using
+          # the latest syntax.
+          python_version: 3.6.15
 
   test-cpython:
     jobs:
@@ -63,35 +65,35 @@ workflows:
           tox_environment: py36
           matrix:
             parameters:
-              cov_version: ['41', '5']
+              cov_version: ['41', '5', '6']
       - toxpy:
           name: test-py3.7-cov<<matrix.cov_version>>
           docker_image: '3.7'
           tox_environment: py37
           matrix:
             parameters:
-              cov_version: ['41', '5']
+              cov_version: ['41', '5', '6']
       - toxpy:
           name: test-py3.8-cov<<matrix.cov_version>>
           docker_image: '3.8'
           tox_environment: py38
           matrix:
             parameters:
-              cov_version: ['41', '5']
+              cov_version: ['41', '5', '6']
       - toxpy:
           name: test-py3.9-cov<<matrix.cov_version>>
           docker_image: '3.9'
           tox_environment: py39
           matrix:
             parameters:
-              cov_version: ['41', '5']
+              cov_version: ['41', '5', '6']
       - toxpy:
           name: test-py3.10-cov<<matrix.cov_version>>
           docker_image: '3.10'
           tox_environment: py310
           matrix:
             parameters:
-              cov_version: ['41', '5']
+              cov_version: ['41', '5', '6']
 
   test-pypy:
     jobs:
@@ -100,4 +102,10 @@ workflows:
           matrix:
             parameters:
               cov_version: ['41', '5']
-              docker_image: ['3-5', '3-6', '3-7']
+              docker_image: ['3-5', '3-6']
+      - toxpypy:
+          name: test-pypy3-7-cov<<matrix.cov_version>>
+          docker_image: '3-7'
+          matrix:
+            parameters:
+              cov_version: ['41', '5', '6']

.pre-commit-config.yaml

@@ -28,6 +28,7 @@ repos:
     -   id: double-quote-string-fixer
         exclude: nonunicode/.*
     -   id: name-tests-test
+        exclude: tests/data/.*
     -   id: requirements-txt-fixer
 -   repo: https://github.com/pycqa/pylint
     rev: v2.11.1
@@ -53,6 +54,9 @@ repos:
         - -d too-few-public-methods
         - -d ungrouped-imports  # conflicts with reorder-python-imports
         - -d wrong-import-order  # conflicts with reorder-python-imports
+        - -d consider-using-f-string  # not py35 compatible
+        - -d unspecified-encoding  # TODO: reevaluate
+        - -d disallowed-name  # TODO: fix
         exclude: example/.*
 -   repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.1.10

coveralls/api.py

@@ -229,8 +229,9 @@ def load_config_from_environment(self):
 
     def load_config_from_file(self):
         try:
-            with open(os.path.join(os.getcwd(),
-                                   self.config_filename)) as config:
+            fname = os.path.join(os.getcwd(), self.config_filename)
+
+            with open(fname) as config:
                 try:
                     import yaml  # pylint: disable=import-outside-toplevel
                     self.config.update(yaml.safe_load(config))

coveralls/git.py

@@ -9,16 +9,16 @@
 
 
 def run_command(*args):
-    cmd = subprocess.Popen(list(args), stdout=subprocess.PIPE,
-                           stderr=subprocess.PIPE)
-    stdout, stderr = cmd.communicate()
+    with subprocess.Popen(list(args), stdout=subprocess.PIPE,
+                          stderr=subprocess.PIPE) as cmd:
+        stdout, stderr = cmd.communicate()
 
-    if cmd.returncode != 0:
-        raise CoverallsException(
-            'command return code {}, STDOUT: "{}"\nSTDERR: "{}"'.format(
-                cmd.returncode, stdout, stderr))
+        if cmd.returncode != 0:
+            raise CoverallsException(
+                'command return code {}, STDOUT: "{}"\nSTDERR: "{}"'.format(
+                    cmd.returncode, stdout, stderr))
 
-    return stdout.decode().strip()
+        return stdout.decode().strip()
 
 
 def gitlog(fmt):

setup.py

@@ -6,9 +6,9 @@
 VERSION_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)),
                             'coveralls', 'version.py')
 
-DESCRIPTION = open('README.rst').read()
+with open('README.rst') as f:
+    DESCRIPTION = f.read()
 
-VERSION = None
 with open(VERSION_FILE) as f:
     VERSION = f.read().split()[2][1:-1]
 

tests/api/configuration_test.py

@@ -250,7 +250,7 @@ def test_service_name_from_env(self):
         assert cover.config['repo_token'] == 'a1b2c3d4'
         assert cover.config['service_name'] == 'bbb'
         assert cover.config['flag_name'] == 'cc'
-        assert cover.config['service_number'] == '1234'
+        assert cover.config['service_job_number'] == '1234'
 
 
 @mock.patch.object(Coveralls, 'config_filename', '.coveralls.mock')

tests/api/wear_test.py

@@ -33,46 +33,46 @@ def test_wet_run(self, mock_requests):
         assert result == EXPECTED
 
     def test_merge(self, _mock_requests):
-        coverage_file = tempfile.NamedTemporaryFile()
-        coverage_file.write(
-            b'{"source_files": [{"name": "foobar", "coverage": []}]}')
-        coverage_file.seek(0)
+        with tempfile.NamedTemporaryFile() as coverage_file:
+            coverage_file.write(
+                b'{"source_files": [{"name": "foobar", "coverage": []}]}')
+            coverage_file.seek(0)
 
-        api = coveralls.Coveralls(repo_token='xxx')
-        api.merge(coverage_file.name)
-        result = api.create_report()
+            api = coveralls.Coveralls(repo_token='xxx')
+            api.merge(coverage_file.name)
+            result = api.create_report()
 
-        source_files = json.loads(result)['source_files']
-        assert source_files == [{'name': 'foobar', 'coverage': []}]
+            source_files = json.loads(result)['source_files']
+            assert source_files == [{'name': 'foobar', 'coverage': []}]
 
     def test_merge_empty_data(self, _mock_requests):
-        coverage_file = tempfile.NamedTemporaryFile()
-        coverage_file.write(b'{}')
-        coverage_file.seek(0)
+        with tempfile.NamedTemporaryFile() as coverage_file:
+            coverage_file.write(b'{}')
+            coverage_file.seek(0)
 
-        api = coveralls.Coveralls(repo_token='xxx')
-        api.merge(coverage_file.name)
-        result = api.create_report()
+            api = coveralls.Coveralls(repo_token='xxx')
+            api.merge(coverage_file.name)
+            result = api.create_report()
 
-        source_files = json.loads(result)['source_files']
-        assert source_files == []
+            source_files = json.loads(result)['source_files']
+            assert source_files == []
 
     @mock.patch.object(log, 'warning')
     def test_merge_invalid_data(self, mock_logger, _mock_requests):
-        coverage_file = tempfile.NamedTemporaryFile()
-        coverage_file.write(b'{"random": "stuff"}')
-        coverage_file.seek(0)
+        with tempfile.NamedTemporaryFile() as coverage_file:
+            coverage_file.write(b'{"random": "stuff"}')
+            coverage_file.seek(0)
 
-        api = coveralls.Coveralls(repo_token='xxx')
-        api.merge(coverage_file.name)
-        result = api.create_report()
+            api = coveralls.Coveralls(repo_token='xxx')
+            api.merge(coverage_file.name)
+            result = api.create_report()
 
-        source_files = json.loads(result)['source_files']
-        assert source_files == []
+            source_files = json.loads(result)['source_files']
+            assert source_files == []
 
-        mock_logger.assert_called_once_with('No data to be merged; does the '
-                                            'json file contain "source_files" '
-                                            'data?')
+            mock_logger.assert_called_once_with(
+                'No data to be merged; does the json file contain '
+                '"source_files" data?')
 
     def test_dry_run(self, mock_requests):
         mock_requests.post.return_value.json.return_value = EXPECTED

tests/cli_test.py

@@ -180,9 +180,9 @@ def test_save_report_to_file_no_token(mock_coveralls):
 @mock.patch.dict(os.environ, {'TRAVIS': 'True'}, clear=True)
 def test_submit(mock_submit):
     json_file = os.path.join(EXAMPLE_DIR, 'example.json')
-    json_string = open(json_file).read()
     coveralls.cli.main(argv=['--submit=' + json_file])
-    mock_submit.assert_called_with(json_string)
+    with open(json_file) as f:
+        mock_submit.assert_called_with(f.read())
 
 
 @mock.patch('coveralls.cli.Coveralls')

tests/coverage_templates/bar.py → tests/data/foo.py

@@ -1,12 +1,12 @@
 def test_func(max_val):
     for idx in range(0, max_val):
         if idx == -1:
-            print("Miss 1", idx)
+            print('Miss 1', idx)
         elif idx == 4:
-            print("Hit 1", idx)
+            print('Hit 1', idx)
         elif idx == 6:
-            print("Hit 2", idx)
+            print('Hit 2', idx)
         elif idx == 12:
-            print("Miss 2", idx)
+            print('Miss 2', idx)
         else:
-            print("Other", idx)
+            print('Other', idx)

tests/git_test.py

@@ -22,7 +22,8 @@ def setUp(self):
         self.dir = tempfile.mkdtemp()
 
         os.chdir(self.dir)
-        open('README', 'a').close()
+        # TODO: switch to pathlib
+        open('README', 'a').close()  # pylint: disable=consider-using-with
 
         subprocess.call(['git', 'init'], cwd=self.dir)
         subprocess.call(['git', 'config', 'user.name',