Bump Python requirements files

This commit is the result of running `pip-compile --upgrade` on all the
`.in` files in the repo, with one contraint: `conan==1.59.0` since we do
not yet support Conan 2.

The new tools demanded the following changes via the linting job:

- flake8 no longer accepts inline comments in its config file.
- pylint now requires calls to `requests.get` and `requests.post` to
  specify a timeout.
- pylint no longer accepts certain unnecessary list comprehensions that
  could have been just a generator expression.
- black requires some simple formatting changes.

Author: eskaur

.flake8

@@ -1,15 +1,21 @@
 [flake8]
 ignore =
 ### Covered better by pylint
-    E501, # Line too long
+    # Line too long
+    E501,
 ### Covered by pylint
-    F401, # Imported but unused
+    # Imported but unused
+    F401,
 ### in conflict with black
-    W503, # line break before binary operator
-    E302, # expected 2 blank lines, found 0
-    D202, # No blank lines allowed after function docstring
+    # line break before binary operator
+    W503,
+    # expected 2 blank lines, found 0
+    E302,
+    # No blank lines allowed after function docstring
+    D202,
 ### We do not currently require docstrings in "magic methods"
-    D105, # missing docstring in magic method
+    # missing docstring in magic method
+    D105,
 show-source = True
 
 ### Ignore docstring complaints in data models

.flake8-internal

@@ -1,20 +1,34 @@
 [flake8]
 ignore =
 ### Covered better by pylint
-    E501, # Line too long
-    F401, # Imported but unused
+    # Line too long
+    E501,
+    # Imported but unused
+    F401,
 ### in conflict with black
-    W503, # line break before binary operator
-    E302, # expected 2 blank lines, found 0
-    D202, # No blank lines allowed after function docstring
+    # line break before binary operator
+    W503,
+    # expected 2 blank lines, found 0
+    E302,
+    # No blank lines allowed after function docstring
+    D202,
 ### Permanently disabled for internal linting:
-    D100, # Missing docstring in public module
-    D101, # missing docstring in public class
-    D102, # Missing docstring in public method
-    D103, # missing docstring in public function
-    D104, # missing docstring in public package
-    D105, # missing docstring in magic method
-    D106, # missing docstring in public nested class
-    D107, # missing docstring in __init__
-    I401, # Missing exception(s) in Raises section
+    # Missing docstring in public module
+    D100,
+    # missing docstring in public class
+    D101,
+    # Missing docstring in public method
+    D102,
+    # missing docstring in public function
+    D103,
+    # missing docstring in public package
+    D104,
+    # missing docstring in magic method
+    D105,
+    # missing docstring in public nested class
+    D106,
+    # missing docstring in __init__
+    D107,
+    # Missing exception(s) in Raises section
+    I401,
 show-source = True

.flake8-tests

@@ -1,19 +1,32 @@
 [flake8]
 ignore =
 ### Covered better by pylint
-    E501, # Line too long
-    F401, # Imported but unused
+    # Line too long
+    E501,
+    # Imported but unused
+    F401,
 ### in conflict with black
-    W503, # line break before binary operator
-    E302, # expected 2 blank lines, found 0
-    D202, # No blank lines allowed after function docstring
+    # line break before binary operator
+    W503,
+    # expected 2 blank lines, found 0
+    E302,
+    # No blank lines allowed after function docstring
+    D202,
 ### Permanently disabled for internal linting:
-    D100, # Missing docstring in public module
-    D101, # missing docstring in public class
-    D103, # missing docstring in public function
-    D104, # missing docstring in public package
-    D105, # missing docstring in magic method
-    D106, # missing docstring in public nested class
-    D107, # missing docstring in __init__
-    I401, # Missing exception(s) in Raises section
+    # Missing docstring in public module
+    D100,
+    # missing docstring in public class
+    D101,
+    # missing docstring in public function
+    D103,
+    # missing docstring in public package
+    D104,
+    # missing docstring in magic method
+    D105,
+    # missing docstring in public nested class
+    D106,
+    # missing docstring in __init__
+    D107,
+    # Missing exception(s) in Raises section
+    I401,
 show-source = True

continuous-integration/code-generation/check_datamodels_up_to_date.py

@@ -6,7 +6,6 @@
 
 
 def _check_datamodels_up_to_date(repo_root: Path):
-
     regeneration_script = Path(
         "continuous-integration/code-generation/docker_generate_datamodels.sh"
     )

continuous-integration/code-generation/datamodel_frontend_generator.py

@@ -74,7 +74,6 @@ def _inner_classes_list(cls: Any) -> List:
 
 
 def _imports(extra_imports: Sequence[str]) -> str:
-
     linter_exceptions = [
         "too-many-lines",
         "protected-access",
@@ -98,13 +97,11 @@ def _imports(extra_imports: Sequence[str]) -> str:
 
 
 def _create_init_special_member_function(node_data: NodeData, base_type: str) -> str:
-
     full_dot_path = _get_dot_path(base_type, node_data.path)
     signature_vars = ""
     member_variable_set = ""
 
     for container in node_data.member_containers:
-
         if container.container_info is None:
             raise RuntimeError(f"Unexpected lack of container info: {container}")
 
@@ -129,7 +126,6 @@ def _create_init_special_member_function(node_data: NodeData, base_type: str) ->
         )
 
     for member in node_data.member_variables:
-
         if member.member_info is None:
             raise RuntimeError(f"Unexpected lack of member info: {member}")
 
@@ -142,7 +138,6 @@ def _create_init_special_member_function(node_data: NodeData, base_type: str) ->
         signature_vars += f"{member.snake_case}={full_dot_path}.{member.name}().value,"
 
         if member.is_enum:
-
             member_variable_set += dedent(
                 f"""
                 if isinstance({member.snake_case},{full_dot_path}.{member.name}.enum) {is_none_check}:
@@ -168,7 +163,6 @@ def _create_init_special_member_function(node_data: NodeData, base_type: str) ->
             )
 
     for child_class in node_data.children:
-
         if child_class.is_uninstantiated_node:
             continue
         signature_vars += f"{child_class.snake_case}=None,"
@@ -224,7 +218,6 @@ def __eq__(self, other):
 
 
 def _create_str_special_member_function(node_data: NodeData, base_type: str) -> str:
-
     full_underscore_path = _get_underscore_name(base_type, node_data.path)
     str_content = f"str(_to_internal_{full_underscore_path}(self))"
 
@@ -237,12 +230,10 @@ def __str__(self):
 
 
 def _create_properties(node_data: NodeData, base_type: str) -> str:
-
     get_properties = "\n"
     set_properties = "\n"
 
     for node in node_data.member_containers:
-
         if node.container_info is None:
             raise RuntimeError(f"Unexpected lack of container info: {node}")
 
@@ -270,7 +261,6 @@ def {node.snake_case}(self,value):
         )
 
     for member in node_data.member_variables:
-
         if member.member_info is None:
             raise RuntimeError(f"Unexpected lack of member info: {member}")
 
@@ -400,7 +390,6 @@ def save(self, file_name):
 
 
 def _create_enum_class(member: NodeData, base_type: str) -> str:
-
     full_dot_path = _get_dot_path(base_type, member.path)
 
     static_members = ["\n"]
@@ -493,7 +482,6 @@ def _parse_internal_datamodel(current_class: Any) -> NodeData:
     member_containers = []
     to_be_removed = []
     for child in child_classes:
-
         if child.underlying_zivid_class.node_type.name == "leaf_data_model_list":
             child.container_info = ContainerInfo(
                 contained_type=child.underlying_zivid_class.contained_type,
@@ -546,7 +534,6 @@ def _parse_internal_datamodel(current_class: Any) -> NodeData:
 
 
 def _create_to_frontend_converter(node_data: NodeData, base_type: str) -> str:
-
     base_typename = base_type.split(".")[-1]
     temp_internal_name = f"internal_{node_data.snake_case}"
     nested_converters = [
@@ -599,7 +586,6 @@ def _to_{underscored_path}(internal_{node_data.snake_case}):
 
 
 def _create_to_internal_converter(node_data: NodeData, base_type: str) -> str:
-
     temp_internal_name = f"internal_{node_data.snake_case}"
     nested_converters = [
         _create_to_internal_converter(element, base_type=base_type)
@@ -702,7 +688,6 @@ def _generate_datamodel_frontend(
 
     # Format source code and save to destination path
     with tempfile.NamedTemporaryFile(suffix=".py") as temp_file:
-
         temp_file_path = Path(temp_file.name)
         temp_file_path.write_text(raw_text, encoding="utf-8")
         if verbose:
@@ -717,7 +702,6 @@ def _generate_datamodel_frontend(
 
 
 def generate_all_datamodels(dest_dir: Path) -> None:
-
     for internal_class, filename, extra_imports in [
         (_zivid.Settings, "settings.py", ["datetime", "collections.abc"]),
         (_zivid.Settings2D, "settings_2d.py", ["datetime", "collections.abc"]),

continuous-integration/notification/notify_teams.py

@@ -53,7 +53,7 @@ def _main() -> None:
             }
         ],
     }
-    request = requests.post(webhook_url, json=payload)
+    request = requests.post(webhook_url, json=payload, timeout=25)
     try:
         request.raise_for_status()
     except requests.HTTPError as ex:

continuous-integration/python-requirements/build.in

@@ -1,4 +1,4 @@
 scikit-build
 cmake
 ninja
-conan
+conan==1.59.0

continuous-integration/python-requirements/build.txt

@@ -1,68 +1,68 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile continuous-integration/python-requirements/build.in
 #
-bottle==0.12.20
+bottle==0.12.25
     # via conan
-certifi==2021.10.8
+certifi==2023.5.7
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==3.1.0
     # via requests
-cmake==3.22.1
-    # via -r .\continuous-integration\python-requirements\build.in
-colorama==0.4.4
+cmake==3.26.3
+    # via -r continuous-integration/python-requirements/build.in
+colorama==0.4.6
+    # via conan
+conan==1.59.0
+    # via -r continuous-integration/python-requirements/build.in
+distro==1.8.0
     # via
     #   conan
-    #   tqdm
-conan==1.52.0
-    # via -r .\continuous-integration\python-requirements\build.in
-distro==1.6.0
-    # via scikit-build
-fasteners==0.17.2
+    #   scikit-build
+fasteners==0.18
     # via conan
-idna==3.3
+idna==3.4
     # via requests
-jinja2==3.0.3
+jinja2==3.1.2
     # via conan
-markupsafe==2.0.1
+markupsafe==2.1.2
     # via jinja2
-ninja==1.10.2.3
-    # via -r .\continuous-integration\python-requirements\build.in
+ninja==1.11.1
+    # via -r continuous-integration/python-requirements/build.in
 node-semver==0.6.1
     # via conan
-packaging==21.3
+packaging==23.1
     # via scikit-build
 patch-ng==1.17.4
     # via conan
 pluginbase==1.0.1
     # via conan
-pygments==2.11.2
+pygments==2.15.1
     # via conan
-pyjwt==2.4.0
+pyjwt==2.6.0
     # via conan
-pyparsing==3.0.6
-    # via packaging
 python-dateutil==2.8.2
     # via conan
-pyyaml==5.4.1
+pyyaml==6.0
     # via conan
-requests==2.27.1
+requests==2.30.0
     # via conan
-scikit-build==0.12.0
-    # via -r .\continuous-integration\python-requirements\build.in
+scikit-build==0.17.3
+    # via -r continuous-integration/python-requirements/build.in
 six==1.16.0
     # via
     #   conan
     #   python-dateutil
-tqdm==4.62.3
+tomli==2.0.1
+    # via scikit-build
+tqdm==4.65.0
     # via conan
-urllib3==1.26.8
+urllib3==1.26.15
     # via
     #   conan
     #   requests
-wheel==0.37.1
+wheel==0.40.0
     # via scikit-build
 
 # The following packages are considered to be unsafe in a requirements file: