Merge tag '1.1.0' into mirror

Author: asitha-sena

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
   stage: test
   parallel:
     matrix:
-      - PYTHON_VERSION: ["3.9", "3.10", "3.11", "3.12"]
+      - PYTHON_VERSION: ["3.9", "3.10", "3.11", "3.12", "3.13"]
   script:
     - python -m pip install .
     - python -m pip install pytest nbval

changelog.txt

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+1.1.0 (2025-06-03)
+------------------
+- Fix minor issues in v4.1 and v4.1.1 standard dictionaries and include latest
+  abbreviations
+- Show warnings and FYI count in error log only if explicitly requested (Issue
+  #122)
+- Export None and NA entries in in .xlsx file to "" instead of "NaN" when
+  converting to .ags (Issue #126)
+- Add utils.py module with functions to convert official AGS4 standard
+  dictionaries from .json to .ags
+- Add support for Python 3.13
+- Improve documentation in CLI
+- Remove redundant log messages
+
+
 1.0.0 (2024-08-06)
 --------------
 - Report TRAN_AGS in error report. This allows the reader to verify whether the

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-AGS4"
-version = "1.0.0"
+version = "1.1.0"
 description = "A library to read, write, and check AGS4 files using Pandas DataFrames"
 authors = ["Asitha Senanayake <asitha_sena@yahoo.com>"]
 license = "LGPL-3.0"

python_ags4/AGS4.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2024  Asitha Senanayake
+# Copyright (C) 2020-2025  Asitha Senanayake
 #
 # This file is part of python_ags4.
 #
@@ -431,7 +431,8 @@ def excel_to_AGS4(input_file, output_file, format_numeric_columns=True, dictiona
     from pandas import read_excel
 
     # Read data from Excel file in to a dictionary of dataframes
-    tables = read_excel(input_file, sheet_name=None, engine='openpyxl')
+    tables = read_excel(input_file, sheet_name=None, engine='openpyxl',
+                        keep_default_na=False, na_values='')
 
     # Not all worksheets in the spreadsheet may contain valid AGS4 tables, therefore
     # initiate variable to keep track of worksheets to export
@@ -688,8 +689,7 @@ def _format_SF(value, TYPE):
         return f"{value:.{i}f}"
 
 
-def check_file(filepath_or_buffer, standard_AGS4_dictionary=None, rename_duplicate_headers=True, encoding='utf-8',
-               print_output=True):
+def check_file(filepath_or_buffer, standard_AGS4_dictionary=None, rename_duplicate_headers=True, encoding='utf-8'):
     """Validate AGS4 file against AGS4 rules.
 
     Parameters
@@ -706,8 +706,6 @@ def check_file(filepath_or_buffer, standard_AGS4_dictionary=None, rename_duplica
         to duplicates to make them unique.
     encoding : str, default='utf-8'
         Encoding of text file.
-    print_output : bool, default=True
-        If True, then print output to the console and the logger, otherwise do not.
 
     Returns
     -------
@@ -720,8 +718,6 @@ def check_file(filepath_or_buffer, standard_AGS4_dictionary=None, rename_duplica
 
     ags_errors = {}
 
-    logger.info(f'Opening file... {filepath_or_buffer}')
-
     # Line checks
     if _is_file_like(filepath_or_buffer):
         f = filepath_or_buffer
@@ -757,8 +753,6 @@ def check_file(filepath_or_buffer, standard_AGS4_dictionary=None, rename_duplica
         headings = []
 
         logger.info('Checking lines...')
-        if print_output:
-            logger.info('Checking lines...')
 
         for i, line in enumerate(f, start=1):
 
@@ -955,21 +949,23 @@ def write_error_report(ags_errors, output_file, show_warnings=False, show_fyi=Fa
             # Summary of errors log
             if error_count == 0:
                 f.write('All checks passed!\r\n')
-
-                if warnings_count + fyi_count > 0:
-                    f.write(f'{warnings_count} warning(s) and {fyi_count} FYI message(s) returned.\r\n')
-                    f.write('\r\n')
+                f.write('\r\n')
 
             elif ('AGS Format Rule 3' in ags_errors) and ('AGS3' in ags_errors['AGS Format Rule 3'][0]['desc']):
                 f.write('Checking aborted as AGS3 files are not supported!\r\n')
                 f.write('\r\n')
 
             else:
                 f.write(f'{error_count} error(s) found in file!\r\n')
+                f.write('\r\n')
 
-                if warnings_count + fyi_count > 0:
-                    f.write(f'{warnings_count} warning(s) and {fyi_count} FYI message(s) returned.\r\n')
+            # Write summary of warnings and FYI messages
+            if show_warnings:
+                f.write(f'{warnings_count} warning(s) returned.\r\n')
+                f.write('\r\n')
 
+            if show_fyi:
+                f.write(f'{fyi_count} FYI message(s) returned.\r\n')
                 f.write('\r\n')
 
             # Write 'General' error messages first if present