excel-list-transform 0.7.0__tar.gz → 0.7.3__tar.gz

{excel_list_transform-0.7.0/excel_list_transform.egg-info → excel_list_transform-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: excel-list-transform
-Version: 0.7.0
+Version: 0.7.3
 Summary: Transform a list in excel or CSV
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -12,13 +12,13 @@ Requires-Python: >=3.12.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20241025
+Requires-Dist: types-openpyxl>=3.1.5.20241225
 Requires-Dist: pylightxl>=1.61
 Requires-Dist: XlsxWriter>=3.2.0
 Requires-Dist: pip>=24.2
-Requires-Dist: setuptools>=75.3.0
+Requires-Dist: setuptools>=75.6.0
 Requires-Dist: build>=1.2.2
-Requires-Dist: wheel>=0.44.0
+Requires-Dist: wheel>=0.45.1
 
 # excel-list-transform
 

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3/excel_list_transform.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: excel-list-transform
-Version: 0.7.0
+Version: 0.7.3
 Summary: Transform a list in excel or CSV
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -12,13 +12,13 @@ Requires-Python: >=3.12.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20241025
+Requires-Dist: types-openpyxl>=3.1.5.20241225
 Requires-Dist: pylightxl>=1.61
 Requires-Dist: XlsxWriter>=3.2.0
 Requires-Dist: pip>=24.2
-Requires-Dist: setuptools>=75.3.0
+Requires-Dist: setuptools>=75.6.0
 Requires-Dist: build>=1.2.2
-Requires-Dist: wheel>=0.44.0
+Requires-Dist: wheel>=0.45.1
 
 # excel-list-transform
 

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/excel_list_transform.egg-info/requires.txt

@@ -1,8 +1,8 @@
 openpyxl>=3.1.5
-types-openpyxl>=3.1.5.20241025
+types-openpyxl>=3.1.5.20241225
 pylightxl>=1.61
 XlsxWriter>=3.2.0
 pip>=24.2
-setuptools>=75.3.0
+setuptools>=75.6.0
 build>=1.2.2
-wheel>=0.44.0
+wheel>=0.45.1

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "excel-list-transform"
-version = "0.7.0"
+version = "0.7.3"
 authors = [
   { name="Tom Björkholm", email="klausuler_linnet0q@icloud.com" },
 ]

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
   name='excel-list-transform',
-  version='0.7.0',
+  version='0.7.3',
   description='Transform a list in excel or CSV.',
   author='Tom Björkholm',
   author_email='klausuler_linnet0q@icloud.com',
@@ -15,12 +15,12 @@ setup(
   package_data={'excel_list_transform': ['src/py.typed']},
   install_requires=[
     'openpyxl >= 3.1.5',
-    'types-openpyxl >= 3.1.5.20241025',
+    'types-openpyxl >= 3.1.5.20241225',
     'pylightxl >= 1.61',
     'XlsxWriter >= 3.2.0',
     'pip >= 24.2',
-    'setuptools >= 75.3.0',
+    'setuptools >= 75.6.0',
     'build >= 1.2.2',
-    'wheel>=0.44.0'
+    'wheel>=0.45.1'
   ]
 )

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/config.py

@@ -9,6 +9,7 @@ from copy import deepcopy
 import json
 import sys
 import csv
+from collections import Counter
 from typing import Any, Optional, Type, TypeVar, Mapping, NamedTuple, Callable
 from enum import Enum, IntEnum
 from tempfile import TemporaryFile
@@ -394,3 +395,15 @@ class Config():
         if not Config.valid_char_encoding(enc=enc):
             print(f'{enc} is not a recognized encoding', file=sys.stderr)
             sys.exit(1)
+
+    @staticmethod
+    def check_no_duplicates(expanded_data: list[str] | list[int],
+                            param_name: str) -> None:
+        """Error report duplicate data."""
+        dup = [str(k) for k, v in Counter(expanded_data).items() if v > 1]
+        if len(dup) == 0:
+            return
+        msg = f'Duplicates not allowed in {param_name}. Duplicate values: '  # noqa: E713, E501
+        msg += ','.join(dup)
+        print(msg, file=sys.stderr)
+        sys.exit(1)

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/config_excel_list_transform.py

@@ -8,7 +8,6 @@
 import sys
 from copy import deepcopy
 from enum import Enum
-from collections import Counter
 from typing import Optional, Callable, TypeAlias, TypeVar, NamedTuple, Generic
 from csv import Dialect
 from excel_list_transform.config import Config, ParseConverter
@@ -150,18 +149,6 @@ class ConfigExcelListTransform(Config, Generic[Column]):  # pylint: disable=too-
                 'in_excel_col_name_strip': False,
                 'in_excel_values_strip': False}
 
-    @staticmethod
-    def _duplicates_not_allowed(expanded_data: list[Column],
-                                param_name: str) -> None:
-        """Error report duplicate data."""
-        dup = [str(k) for k, v in Counter(expanded_data).items() if v > 1]
-        if len(dup) == 0:
-            return
-        msg = f'Duplicates not allowed in {param_name}. Duplicate values: '  # noqa: E713, E501
-        msg += ','.join(dup)
-        print(msg, file=sys.stderr)
-        raise KeyError(msg)
-
     @staticmethod
     def get_cols_single(rule: Rule[Column] | RuleSplit[Column] |
                         RuleRewrite[Column],
@@ -192,7 +179,7 @@ class ConfigExcelListTransform(Config, Generic[Column]):  # pylint: disable=too-
         """Flag as error if column is refered to multiple times."""
         cols: list[Column] = ConfigExcelListTransform.get_cols_single(rule,
                                                                       tinfo)
-        ConfigExcelListTransform._duplicates_not_allowed(cols, param_name)
+        ConfigExcelListTransform.check_no_duplicates(cols, param_name)
 
     @staticmethod
     def _check_no_duplicate_multi(rule: RuleMerge[Column],
@@ -200,7 +187,7 @@ class ConfigExcelListTransform(Config, Generic[Column]):  # pylint: disable=too-
         """Flag as error if column is refered to multiple times."""
         cols: list[Column] = ConfigExcelListTransform.get_cols_multi(rule,
                                                                      tinfo)
-        ConfigExcelListTransform._duplicates_not_allowed(cols, param_name)
+        ConfigExcelListTransform.check_no_duplicates(cols, param_name)
 
     @staticmethod
     def _check_increasing_multi(rule: RuleMerge[Column], param_name: str,

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/config_xls_list_refmt_name.py

@@ -37,4 +37,4 @@ class ConfigXlsListRefmtName(ConfigExcelListTransform[str]):  # pylint: disable=
                          colinfo=colinfo, tinfo='a',
                          from_json_text=from_json_text,
                          from_json_filename=from_json_filename)
-        self._duplicates_not_allowed(self.s8_column_order, 's8_column_order')
+        self.check_no_duplicates(self.s8_column_order, 's8_column_order')

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/config_xls_list_refmt_num.py

@@ -51,12 +51,12 @@ class ConfigXlsListRefmtNum(ConfigExcelListTransform[int]):  # pylint: disable=t
                          colinfo=colinfo, tinfo=2,
                          from_json_text=from_json_text,
                          from_json_filename=from_json_filename)
-        self._duplicates_not_allowed(self.s2_remove_columns,
-                                     's2_remove_columns')
+        self.check_no_duplicates(self.s2_remove_columns,
+                                 's2_remove_columns')
         self._check_increasing_multi(self.s3_merge_columns,
                                      's3_merge_columns', 2)
-        self._duplicates_not_allowed(self.s4_place_columns_first,
-                                     's4_place_columns_first')
+        self.check_no_duplicates(self.s4_place_columns_first,
+                                 's4_place_columns_first')
 
     def sort_sx_hook(self) -> None:
         """Sort s[0-9]_ as needed as needed (hook)."""

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/generate_cfg.py

@@ -7,7 +7,7 @@
 
 from excel_list_transform.file_extension import fix_file_extension
 from excel_list_transform.config_enums import ColumnRef, FileType, \
-    RewriteKind, CaseSensitivity, ExcelLib
+    RewriteKind, CaseSensitivity, ExcelLib, SplitWhere
 from excel_list_transform.config_factory import config_factory_from_enum
 from excel_list_transform.generate_txt import generate_syntax_txt
 from excel_list_transform.config_xls_list_refmt_name import \
@@ -15,15 +15,7 @@ from excel_list_transform.config_xls_list_refmt_name import \
 from excel_list_transform.config_xls_list_refmt_num import \
     ConfigXlsListRefmtNum
 
-syntax_o2x_common: str = '''
-
-Column names are changed from another language (Swedish) and sometimes from
-a more instuctive naming to the names understood by RRS.
-
-The events does not use divisions, boat names and WhatsApp. Thus the
-form did not ask for these. They are inserted as empty columns to please
-RRS.
-
+syntax_phone_fix: str = '''
 The phone number has to be in international format '+' followed by only
 digits for RRS, but the sailors filling in the form sometimes use
 national format (no + and no country code). Also the sailors filling
@@ -35,6 +27,17 @@ phone numbers. For other countries s7_rewrite_columns need to be
 adjusted.
 '''
 
+syntax_o2x_common: str = '''
+
+Column names are changed from another language (Swedish) and sometimes from
+a more instuctive naming to the names understood by RRS.
+
+The events does not use divisions, boat names and WhatsApp. Thus the
+form did not ask for these. They are inserted as empty columns to please
+RRS.
+
+''' + syntax_phone_fix
+
 syntax_only_o2r_common: str = '''
 This an example of taking a registration list from the excel file received
 from office forms or google forms and transforming it for importing into
@@ -60,6 +63,94 @@ is "BY_NAME".
 
 syntax_o2r_common: str = syntax_only_o2r_common + syntax_o2x_common
 
+syntax_s2r_common: str = '''
+
+In this example the input data is exported as JSON or XML from SailWave
+https://www.sailwave.com . The data as a list in excel format is then
+extracted using extract-list https://pypi.org/project/extract-list.
+As SW only has a name field and not first name and last name fields,
+and as SW has not field for WhatsApp, this processing of the data is needed
+before it can be imported into RRS https://www.racingrulesofsailing.org/
+
+The Name column is split into First Name and Last Name columns.
+The column WhatsApp is added with no data.
+
+''' + syntax_phone_fix
+
+
+def generate_syntax_s2r_name(filename: str, colref: ColumnRef) -> None:
+    """Generate config example for office_forms_to_rrs."""
+    assert colref == ColumnRef.BY_NAME
+    cfg = ConfigXlsListRefmtName()
+    cfg.out_excel_library = ExcelLib.OPENPYXL
+    cfg.in_type = FileType.EXCEL
+    cfg.out_type = FileType.EXCEL
+    cfg.s1_split_columns = [{'column': 'Name',
+                             'separator': ' ',
+                             'where': SplitWhere.RIGHTMOST,
+                             'right_name': 'Last Name'}]
+    cfg.s3_merge_columns = []
+    cfg.s5_rename_columns = [{'column': 'Name', 'name': 'First Name'}]
+    cfg.s6_insert_columns = [{'column': 'WhatsApp', 'value': None}]
+    cfg.s7_rewrite_columns = [
+        {'column': 'Phone', 'kind': RewriteKind.STRIP,
+         'chars': '', 'case': CaseSensitivity.IGNORE_CASE},
+        {'column': 'Phone', 'kind': RewriteKind.REMOVECHARS,
+         'chars': [' ', '-'], 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 'Phone', 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^07', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 'Phone', 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^\\+4607', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 'Phone', 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^467', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 'Phone', 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^4607', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE}]
+    cfg.s8_column_order = ['Class', 'Division', 'Nationality',
+                           'Sail Number', 'Boat Name', 'First Name',
+                           'Last Name', 'Club Name', 'Email', 'Phone',
+                           'WhatsApp']
+    cfg.write(to_json_filename=filename)
+
+
+TXT_S2R_NAME = syntax_s2r_common + by_name_common
+
+
+def generate_syntax_s2r_num(filename: str, colref: ColumnRef) -> None:
+    """Generate config example for office_forms_to_rrs."""
+    assert colref == ColumnRef.BY_NUMBER
+    cfg = ConfigXlsListRefmtNum()
+    cfg.out_excel_library = ExcelLib.OPENPYXL
+    cfg.in_type = FileType.EXCEL
+    cfg.out_type = FileType.EXCEL
+    cfg.s1_split_columns = [{'column': 5, 'separator': ' ',
+                             'where': SplitWhere.RIGHTMOST,
+                             'store_single': SplitWhere.RIGHTMOST}]
+    cfg.s2_remove_columns = []
+    cfg.s3_merge_columns = []
+    cfg.s4_place_columns_first = []
+    cfg.s5_rename_columns = \
+        [{'column': 5, 'name': 'First Name'},
+         {'column': 6, 'name': 'Last Name'}]
+    cfg.s6_insert_columns = [{'column': 10, 'name': 'WhatsApp',
+                              'value': None}]
+    cfg.s7_rewrite_columns = [
+        {'column': 9, 'kind': RewriteKind.STRIP,
+         'chars': '', 'case': CaseSensitivity.IGNORE_CASE},
+        {'column': 9, 'kind': RewriteKind.REMOVECHARS,
+         'chars': [' ', '-'], 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 9, 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^07', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 9, 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^\\+4607', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 9, 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^467', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE},
+        {'column': 9, 'kind': RewriteKind.REGEX_SUBSTITUTE,
+         'from': '^4607', 'to': '+467', 'case': CaseSensitivity.MATCH_CASE}]
+    cfg.write(to_json_filename=filename)
+
+
+TXT_S2R_NUM = syntax_s2r_common + by_number_common
+
 
 def generate_syntax_o2r_name(filename: str, colref: ColumnRef) -> None:
     """Generate config example for office_forms_to_rrs."""
@@ -341,6 +432,8 @@ dispatch = {'forms_to_rrs': {ColumnRef.BY_NAME: generate_syntax_o2r_name,
                             ColumnRef.BY_NUMBER: generate_syntax_o2s_num},
             'rrs_to_sw': {ColumnRef.BY_NAME: generate_syntax_r2s_name,
                           ColumnRef.BY_NUMBER: generate_syntax_r2s_num},
+            'sw_to_rrs': {ColumnRef.BY_NAME: generate_syntax_s2r_name,
+                          ColumnRef.BY_NUMBER: generate_syntax_s2r_num},
             'example': {ColumnRef.BY_NAME: generate_syntax_example,
                         ColumnRef.BY_NUMBER: generate_syntax_example}}
 
@@ -350,6 +443,8 @@ txts = {'forms_to_rrs': {ColumnRef.BY_NAME: TXT_O2R_NAME,
                         ColumnRef.BY_NUMBER: TXT_O2S_NUM},
         'rrs_to_sw': {ColumnRef.BY_NAME: TXT_R2S_NAME,
                       ColumnRef.BY_NUMBER: TXT_R2S_NUM},
+        'sw_to_rrs': {ColumnRef.BY_NAME: TXT_S2R_NAME,
+                      ColumnRef.BY_NUMBER: TXT_S2R_NUM},
         'example': {ColumnRef.BY_NAME: TXT_SYNTAX_WXAMPLE,
                     ColumnRef.BY_NUMBER: TXT_SYNTAX_WXAMPLE}}
 

{excel_list_transform-0.7.0 → excel_list_transform-0.7.3}/src/excel_list_transform/transform_cmd.py

@@ -130,11 +130,12 @@ def transform_cmd(arguments: Optional[list[str]] = None) -> None:
         del fixed_args[0]
     if len(fixed_args) > 2 and '-m' == fixed_args[0]:
         del fixed_args[0]
-    while len(fixed_args) > 1 and fixed_args[0][-3:] == '.py':
+    while len(fixed_args) >= 1 and fixed_args[0][-3:] == '.py':
         del fixed_args[0]
     desc = GENERAL_DESCRIPTION + \
         USAGE_ORDER
-    parser = argparse.ArgumentParser(description=desc, epilog=epimain)
+    parser = argparse.ArgumentParser(prog='excel_list_transform',
+                                     description=desc, epilog=epimain)
     subparsers = parser.add_subparsers(dest='subparser_name', required=True)
     gen_cfg_args(subparsers)
     rfmt_args(subparsers)