Merge pull request #21 from syngenta/ci/add-pyupgrade

ci: add pyupgrade to pre-commit

.pre-commit-config.yaml

@@ -24,3 +24,9 @@ repos:
     hooks:
       - id: isort
         files: '^src/.*\.pyi?$'
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus, --keep-runtime-typing]
+        files: '.*\.pyi?$'

src/linchemin/IO/io.py

@@ -28,7 +28,7 @@ def write_json(data, file_path: Union[Path, str], indent=4, overwrite=True):
 
 def read_json(file_path: Union[Path, str]):
     file_path = get_file_path(file_path, 'r')
-    with open(file_path, 'r') as f:
+    with open(file_path) as f:
         data = json.load(f)
     return data
 
@@ -46,7 +46,7 @@ def dict_list_to_csv(data: List[dict], file_path: Union[Path, str], delimiter: s
 
 def csv_to_dict_list(file_path: Union[Path, str], delimiter: str = ','):
     file_path = get_file_path(file_path=file_path, mode='r')
-    with open(file_path, 'r') as file:
+    with open(file_path) as file:
         content = csv.DictReader(file, delimiter=delimiter)
         return [dict(row) for row in content]
 

src/linchemin/cgu/discgraph.py

@@ -72,5 +72,5 @@ def __str__(self):
             if connections:
                 text = text + '{} -> {} \n'.format(r, *connections)
             else:
-                text = text + '{}\n'.format(r)
+                text = text + f'{r}\n'
         return text

src/linchemin/cgu/syngraph.py

@@ -123,7 +123,7 @@ def __str__(self):
             if connections:
                 text = text + '{} -> {} \n'.format(r, *connections)
             else:
-                text = text + '{}\n'.format(r)
+                text = text + f'{r}\n'
         return text
 
     def add_node(self, nodes_tup: tuple):

src/linchemin/configuration/config.py

@@ -183,7 +183,7 @@ def create(self):
             if not file.exists():
                 write = True
             else:
-                with open(file, 'r') as stream:
+                with open(file) as stream:
                     content_old = yaml.load(stream, Loader=yaml.Loader)
                 message = f'\nThe {name} file was found in {file} \n' \
                           f' current  file content: {content_old}\n' \

src/linchemin/rem/clustering.py

@@ -80,7 +80,7 @@ def get_clustering(self, dist_matrix, save_dist_matrix, **kwargs):
             logger.error('Hdbscan found only noise. This can occur if less than 15 routes were given')
             raise OnlyNoiseClustering
         s_score = compute_silhouette_score(dist_matrix, clustering.labels_)
-        print('The Silhouette score is {:.3f}'.format(round(s_score, 3)))
+        print(f'The Silhouette score is {round(s_score, 3):.3f}')
         return (clustering, s_score, dist_matrix) if save_dist_matrix is True else (clustering, s_score)
 
 
@@ -101,7 +101,7 @@ def get_clustering(self, dist_matrix, save_dist_matrix, **kwargs):
             raise OnlyNoiseClustering
         print(f'The number of clusters with the best Silhouette score is {best_n_cluster}')
 
-        print('The Silhouette score is {:.3f}'.format(round(s_score, 3)))
+        print(f'The Silhouette score is {round(s_score, 3):.3f}')
         return (clustering, s_score, dist_matrix) if save_dist_matrix is True else (clustering, s_score)