linting

Author: jonkeane

rsconnect/environment.py

@@ -161,7 +161,11 @@ def create_python_environment(
 
     @classmethod
     def _get_python_env_info(
-        cls, file_name: str, python: typing.Optional[str], force_generate: bool = False, require_requirements_txt: bool = True
+        cls,
+        file_name: str,
+        python: typing.Optional[str],
+        force_generate: bool = False,
+        require_requirements_txt: bool = True,
     ) -> "Environment":
         """
         Gathers the python and environment information relating to the specified file
@@ -176,7 +180,12 @@ def _get_python_env_info(
         """
         python = which_python(python)
         logger.debug("Python: %s" % python)
-        environment = cls._inspect_environment(python, os.path.dirname(file_name), force_generate=force_generate, require_requirements_txt=require_requirements_txt)
+        environment = cls._inspect_environment(
+            python,
+            os.path.dirname(file_name),
+            force_generate=force_generate,
+            require_requirements_txt=require_requirements_txt,
+        )
         if environment.error:
             raise RSConnectException(environment.error)
         logger.debug("Python: %s" % python)
@@ -204,10 +213,10 @@ def _inspect_environment(
         args = [python, "-m", "rsconnect.subprocesses.inspect_environment"]
         if flags:
             args.append("-" + "".join(flags))
-            
+
         # Add arguments for inspect_environment.py
         args.append(directory)
-        
+
         if not require_requirements_txt:
             args.append("--no-require-requirements")
 

rsconnect/subprocesses/inspect_environment.py

@@ -60,10 +60,12 @@ class EnvironmentException(Exception):
     pass
 
 
-def detect_environment(dirname: str, force_generate: bool = False, require_requirements_txt: bool = True) -> EnvironmentData:
+def detect_environment(
+    dirname: str, force_generate: bool = False, require_requirements_txt: bool = True
+) -> EnvironmentData:
     """Determine the python dependencies in the environment.
 
-    `pip freeze` will be used to introspect the environment if force_generate=True or if 
+    `pip freeze` will be used to introspect the environment if force_generate=True or if
     requirements.txt is missing and require_requirements_txt=False.
 
     :param: dirname Directory name
@@ -218,33 +220,34 @@ def main():
     try:
         if len(sys.argv) < 2:
             raise EnvironmentException("Usage: %s [-fc] DIRECTORY [--no-require-requirements]" % sys.argv[0])
-        
+
         # Parse arguments
         flags = ""
         force_generate = False
         require_requirements_txt = True
-        
+
         # Check for flags in first argument
-        if len(sys.argv) > 2 and sys.argv[1].startswith('-') and not sys.argv[1].startswith('--'):
+        if len(sys.argv) > 2 and sys.argv[1].startswith("-") and not sys.argv[1].startswith("--"):
             flags = sys.argv[1]
             if "f" in flags:
                 force_generate = True
-                
+
         # Check for --no-require-requirements flag
         if "--no-require-requirements" in sys.argv:
             require_requirements_txt = False
-            
+
         # directory is always the first non-flag argument
         directory_index = 1
-        while directory_index < len(sys.argv) and (sys.argv[directory_index].startswith('-') or 
-                                                  sys.argv[directory_index] == "--no-require-requirements"):
+        while directory_index < len(sys.argv) and (
+            sys.argv[directory_index].startswith("-") or sys.argv[directory_index] == "--no-require-requirements"
+        ):
             directory_index += 1
-            
+
         if directory_index >= len(sys.argv):
             raise EnvironmentException("Missing directory argument")
-            
+
         directory = sys.argv[directory_index]
-        
+
         envinfo = detect_environment(directory, force_generate, require_requirements_txt)._asdict()
         if "contents" in envinfo:
             keepers = list(map(strip_ref, envinfo["contents"].split("\n")))

tests/test_environment.py

@@ -83,13 +83,13 @@ def test_pip_freeze(self):
             python_interpreter=sys.executable,
         )
         self.assertEqual(expected, result)
-        
+
     def test_missing_requirements_file(self):
         """Test that missing requirements.txt raises an exception"""
         with tempfile.TemporaryDirectory() as empty_dir:
             with self.assertRaises(RSConnectException) as context:
                 Environment.create_python_environment(empty_dir)
-            
+
             self.assertIn("requirements.txt file is required", str(context.exception))
 
     def test_filter_pip_freeze_output(self):
@@ -144,22 +144,30 @@ def test_is_not_executable(self):
 
 class TestPythonVersionRequirements:
     def test_pyproject_toml(self):
-        env = Environment.create_python_environment(os.path.join(TESTDATA, "python-project", "using_pyproject"), require_requirements_txt=False)
+        env = Environment.create_python_environment(
+            os.path.join(TESTDATA, "python-project", "using_pyproject"), require_requirements_txt=False
+        )
         assert env.python_interpreter == sys.executable
         assert env.python_version_requirement == ">=3.8"
 
     def test_python_version(self):
-        env = Environment.create_python_environment(os.path.join(TESTDATA, "python-project", "using_pyversion"), require_requirements_txt=False)
+        env = Environment.create_python_environment(
+            os.path.join(TESTDATA, "python-project", "using_pyversion"), require_requirements_txt=False
+        )
         assert env.python_interpreter == sys.executable
         assert env.python_version_requirement == ">=3.8,<3.12"
 
     def test_all_of_them(self):
-        env = Environment.create_python_environment(os.path.join(TESTDATA, "python-project", "allofthem"), require_requirements_txt=False)
+        env = Environment.create_python_environment(
+            os.path.join(TESTDATA, "python-project", "allofthem"), require_requirements_txt=False
+        )
         assert env.python_interpreter == sys.executable
         assert env.python_version_requirement == ">=3.8,<3.12"
 
     def test_missing(self):
-        env = Environment.create_python_environment(os.path.join(TESTDATA, "python-project", "empty"), require_requirements_txt=False)
+        env = Environment.create_python_environment(
+            os.path.join(TESTDATA, "python-project", "empty"), require_requirements_txt=False
+        )
         assert env.python_interpreter == sys.executable
         assert env.python_version_requirement is None
 
@@ -281,6 +289,7 @@ def fake_inspect_environment(
         assert environment.python_interpreter == expected_python
         assert environment == expected_environment
 
+
 class TestEnvironmentDeprecations:
     def test_override_python_version(self):
         with mock.patch.object(rsconnect.environment.logger, "warning") as mock_warning:

tests/test_subprocesses_inspect_environment.py

@@ -1,13 +1,10 @@
-import os
 import tempfile
 import pytest
 from unittest import mock
 
-from rsconnect.exception import RSConnectException
 from rsconnect.subprocesses.inspect_environment import (
     output_file,
     detect_environment,
-    pip_freeze,
     EnvironmentException,
 )
 
@@ -17,7 +14,7 @@ def test_output_file_requires_requirements_txt():
     with tempfile.TemporaryDirectory() as empty_dir:
         with pytest.raises(EnvironmentException) as context:
             output_file(empty_dir, "requirements.txt", "pip")
-        
+
         assert "requirements.txt file is required" in str(context.value)
 
 
@@ -26,14 +23,14 @@ def test_detect_environment_requires_requirements_txt():
     with tempfile.TemporaryDirectory() as empty_dir:
         with pytest.raises(EnvironmentException) as context:
             detect_environment(empty_dir, force_generate=False)
-        
+
         assert "requirements.txt file is required" in str(context.value)
 
 
 def test_detect_environment_with_force_generate():
     """Test that detect_environment still works with force_generate=True"""
     with tempfile.TemporaryDirectory() as empty_dir:
-        with mock.patch('rsconnect.subprocesses.inspect_environment.pip_freeze') as mock_pip_freeze:
+        with mock.patch("rsconnect.subprocesses.inspect_environment.pip_freeze") as mock_pip_freeze:
             mock_pip_freeze.return_value = {
                 "filename": "requirements.txt",
                 "contents": "numpy\npandas",