Fix black/click CI problem (#45)

This follows our other changes that moved to Black 22.1 and Flake8 4

Author: jcjones

.github/workflows/ci.yml

@@ -14,18 +14,12 @@ jobs:
       with:
         python-version: 3.9
 
-    - name: Install PyLint
+    - name: Install Linting Tools
       run: |
         python -m pip install --upgrade pip
-        pip install "pylint==2.6.0"
-
-    - name: Install Black
-      run: |
-        pip install "black==19.3b0"
-
-    - name: Install Flake8
-      run: |
-        pip install "flake8==3.8.4"
+        pip install --user pylint==2.6.0
+        pip install --user black~=22.1 click==8.0.4
+        pip install --user flake8~=4.0
 
     - name: Install Partition Manager
       run: |

.github/workflows/release.yaml

@@ -15,19 +15,19 @@ jobs:
   release:
     name: release
     runs-on: ubuntu-latest
-  
+
     steps:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      
+
       - name: Setup python
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
           architecture: 'x64'
-      
+
       - name: Install packages
         run: |
           sudo apt-get update
@@ -47,7 +47,7 @@ jobs:
       - name: Install nFPM
         run: |
           go install github.com/goreleaser/nfpm/v2/cmd/[email protected]
-      
+
       - name: Build partition-manager
         run: |
           mkdir install
@@ -58,7 +58,7 @@ jobs:
           SEMVER=${{ steps.get_version.outputs.version }}
           mkdir nfpm-pkg
           nfpm package -p deb --target "nfpm-pkg/"
-      
+
       - name: "Publish release"
         uses: "marvinpinto/action-automatic-releases@latest"
         with:

.pre-commit-config.yaml

@@ -9,11 +9,11 @@ repos:
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo:  https://github.com/psf/black
-  rev: 19.3b0
+  rev: "22.1.0"
   hooks:
     - id: black
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.4
+  rev: "4.0.0"
   hooks:
     - id: flake8
 - repo: https://github.com/PyCQA/pylint

nfpm.yaml

@@ -6,7 +6,7 @@ version_metadata: git
 maintainer: Let's Encrypt <[email protected]>
 license: MPL
 depends:
-  - python3-yaml 
+  - python3-yaml
 disable_globbing: false
 
 contents:

partitionmanager/migrate.py

@@ -29,8 +29,8 @@ def _override_config_to_map_data(conf):
 
 
 def _get_map_data_from_config(conf, table):
-    """ Helper to return a partition map for the table, either directly or
-        from a configuration override. """
+    """Helper to return a partition map for the table, either directly or
+    from a configuration override."""
     if not conf.assume_partitioned_on:
         problems = pm_tap.get_table_compatibility_problems(conf.dbcmd, table)
         if problems:
@@ -123,7 +123,7 @@ def _plan_partitions_for_time_offsets(
 
 
 def _suffix(lines, *, indent="", mid_suffix="", final_suffix=""):
-    """ Helper that suffixes each line with either mid- or final- suffix """
+    """Helper that suffixes each line with either mid- or final- suffix"""
     for line, is_final in partitionmanager.tools.iter_show_end(lines):
         if is_final:
             yield indent + line + final_suffix
@@ -132,22 +132,22 @@ def _suffix(lines, *, indent="", mid_suffix="", final_suffix=""):
 
 
 def _trigger_column_copies(cols):
-    """ Helper that returns lines copying each column for a trigger. """
+    """Helper that returns lines copying each column for a trigger."""
     for c in cols:
         yield f"`{c}` = NEW.`{c}`"
 
 
 def _make_trigger_name(name):
-    """ Helper that enforces the trigger must be <= 64 chars """
+    """Helper that enforces the trigger must be <= 64 chars"""
     return name[:64]
 
 
 def _generate_sql_copy_commands(
     existing_table, map_data, columns, new_table, alter_commands_iter
 ):
-    """ Generate a series of SQL commands to start a copy of the existing_table
+    """Generate a series of SQL commands to start a copy of the existing_table
     to a new_table, applying the supplied alterations before starting the
-    triggers. """
+    triggers."""
     log = logging.getLogger(
         f"_generate_sql_copy_commands:{existing_table.name} to {new_table.name}"
     )

partitionmanager/table_append_partition.py

@@ -161,7 +161,7 @@ def _parse_partition_map(rows):
 
 
 def get_columns(database, table):
-    """ Gather the columns list via the database command tool. """
+    """Gather the columns list via the database command tool."""
     if not isinstance(table, partitionmanager.types.Table) or not isinstance(
         table.name, partitionmanager.types.SqlInput
     ):
@@ -171,8 +171,8 @@ def get_columns(database, table):
 
 
 def _parse_columns(table, rows):
-    """ Read the columns description and return a list of the columns, where
-    each entry is a dict containing Field and Type. """
+    """Read the columns description and return a list of the columns, where
+    each entry is a dict containing Field and Type."""
     log = logging.getLogger("parse_columns")
     if not rows:
         raise partitionmanager.types.TableInformationException("No column information")
@@ -363,7 +363,7 @@ def _calculate_start_time(last_changed_time, evaluation_time, allowed_lifespan):
 def _get_rate_partitions_with_implicit_timestamps(
     table, filled_partitions, current_position, evaluation_time, active_partition
 ):
-    """ Return a list of PositionPartitions for use in rate calculations.
+    """Return a list of PositionPartitions for use in rate calculations.
 
     The partitions are set with implicit timestamps.
     """
@@ -413,7 +413,7 @@ def _get_rate_partitions_with_implicit_timestamps(
 def _get_rate_partitions_with_queried_timestamps(
     database, table, partition_list, current_position, evaluation_time, active_partition
 ):
-    """ Return a list of PositionPartitions for use in rate calculations.
+    """Return a list of PositionPartitions for use in rate calculations.
 
     The partitions' timestamps are explicitly queried.
     """
@@ -493,9 +493,11 @@ def _plan_partition_changes(
     """
     log = logging.getLogger(f"plan_partition_changes:{table.name}")
 
-    filled_partitions, active_partition, empty_partitions = _split_partitions_around_position(
-        partition_list, current_position
-    )
+    (
+        filled_partitions,
+        active_partition,
+        empty_partitions,
+    ) = _split_partitions_around_position(partition_list, current_position)
     if not empty_partitions:
         log.error(
             f"Partition {active_partition.name} requires manual ALTER "

partitionmanager/table_append_partition_test.py

@@ -767,8 +767,8 @@ def test_plan_partition_changes(self):
         )
 
     def test_plan_partition_changes_misprediction(self):
-        """ We have to handle the case where the partition list doesn't cleanly
-        match reality. """
+        """We have to handle the case where the partition list doesn't cleanly
+        match reality."""
         self.maxDiff = None
         planned = _plan_partition_changes(
             MockDatabase(),
@@ -1084,7 +1084,7 @@ def testgenerate_sql_reorganize_partition_commands_out_of_order(self):
             )
 
     def test_plan_andgenerate_sql_reorganize_partition_commands_with_future_partition(
-        self
+        self,
     ):
         planned = _plan_partition_changes(
             MockDatabase(),

partitionmanager/types.py

@@ -170,7 +170,7 @@ def db_name(self):
 
 
 def is_partition_type(obj):
-    """ True if the object inherits from a _Partition. """
+    """True if the object inherits from a _Partition."""
     return isinstance(obj, _Partition)
 
 
@@ -248,7 +248,7 @@ def __str__(self):
 
 
 class Position:
-    """ An internal class that represents a position as an ordered list of
+    """An internal class that represents a position as an ordered list of
     identifiers, matching the table's partition-by statement.
     """
 
@@ -462,7 +462,7 @@ def set_important(self):
         """Indicate this is an important partition. Used in the
         _plan_partition_changes as a marker that there's a significant
         change in this partition that should be committed even if the
-        overall map isn't changing much. """
+        overall map isn't changing much."""
         self._important = True
         return self
 
@@ -582,7 +582,7 @@ def __str__(self):
 
 
 class MismatchedIdException(Exception):
-    """ Raised if the partition map doesn't use the primary key as its range id."""
+    """Raised if the partition map doesn't use the primary key as its range id."""
 
 
 class TruncatedDatabaseResultException(Exception):