Merge branch 'remove-dataclass' into 'master'

Remove dataclass

See merge request trilinos-devops-consolidation/code/SetProgramOptions!8

Author: William McLendon

.gitignore

@@ -8,7 +8,6 @@ ___*
 *,cover
 htmlcov
 doc/html
-src
 dist
 setconfiguration-dist
 *.whl

.style.yapf

@@ -1,19 +1,28 @@
+# See: https://github.com/google/yapf#knobs for available options
+
 [style]
 based_on_style = google
 ARITHMETIC_PRECEDENCE_INDICATION=True
 blank_lines_around_top_level_definition=3
 blank_lines_between_top_level_imports_and_variables=2
 blank_line_before_nested_class_or_def=True
-COLUMN_LIMIT=100
 COALESCE_BRACKETS=False
+COLUMN_LIMIT=110
 DEDENT_CLOSING_BRACKETS=True
-INDENT_CLOSING_BRACKETS=True
+EACH_DICT_ENTRY_ON_SEPARATE_LINE=True
+INDENT_BLANK_LINES=False
+INDENT_CLOSING_BRACKETS=False
 SPACE_BETWEEN_ENDING_COMMA_AND_CLOSING_BRACKET=True
 SPACE_INSIDE_BRACKETS=False
+#SPACES_AROUND_DICT_DELIMITERS=True
+#SPACES_AROUND_LIST_DELIMITERS=True
 SPACES_AROUND_SUBSCRIPT_COLON=True
+#SPACES_AROUND_TUPLE_DELIMITERS=True
 SPACES_BEFORE_COMMENT=15,30
 SPLIT_BEFORE_DOT=True
 SPLIT_BEFORE_DICT_SET_GENERATOR=True
 SPLIT_COMPLEX_COMPREHENSION=True
 SPLIT_ALL_COMMA_SEPARATED_VALUES=False
 SPLIT_ALL_TOP_LEVEL_COMMA_SEPARATED_VALUES=True
+
+

CHANGELOG.md

@@ -17,6 +17,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Todo (for Unreleased)
 -->
 
+## [0.3.1] <!-- YYYY-MM-DD --> [Unreleased]
+#### Added
+#### Changed
+#### Deprecated
+#### Removed
+#### Fixed
+#### Security
+#### Internal
+- Changed `VariableFieldData` so that it won't use `dataclasses` to keep our
+  Python compatibilty to 3.6 (`dataclasses` requires 3.7 and higher).
+#### Todo (for Unreleased)
+
 
 ## [0.3.0] - 2021-06-15
 #### Added

examples/example-01.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
-import os
-import sys
+# -*- mode: python; py-indent-offset: 4; py-continuation-offset: 4 -*-
 
 import setprogramoptions
 
+
 filename = "example-01.ini"
 popts = setprogramoptions.SetProgramOptions(filename)
 
-section  = "MY_LS_COMMAND"
+section = "MY_LS_COMMAND"
 popts.parse_section(section)
 bash_options = popts.gen_option_list(section, generator="bash")
 print(" ".join(bash_options))

examples/example-02.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
-import os
-import sys
+# -*- mode: python; py-indent-offset: 4; py-continuation-offset: 4 -*-
 
 import setprogramoptions
 
+
 filename = "example-02.ini"
 popts = setprogramoptions.SetProgramOptionsCMake(filename)
 
-section  = "MYPROJ_CONFIGURATION_NINJA"
+section = "MYPROJ_CONFIGURATION_NINJA"
 popts.parse_section(section)
 
 # Generate BASH output
@@ -25,4 +25,3 @@
 print("\n".join(cmake_options))
 
 print("\nDone")
-

examples/example-03.py

@@ -1,17 +1,14 @@
 #!/usr/bin/env python3
 # -*- mode: python; py-indent-offset: 4; py-continuation-offset: 4 -*-
-"""
-Example app for SetProgramOptions
-"""
+
 import os
 from pprint import pprint
 
-
 import setprogramoptions
 
 
 
-def find_config_ini(filename="config.ini", rootpath="." ):
+def find_config_ini(filename="config.ini", rootpath="."):
     """
     Recursively searches for a particular file among the subdirectory structure.
     If we find it, then we return the full relative path to `pwd` to that file.
@@ -28,12 +25,12 @@ def find_config_ini(filename="config.ini", rootpath="." ):
 
     """
     output = None
-    for dirpath,dirnames,filename_list in os.walk(rootpath):
+    for dirpath, dirnames, filename_list in os.walk(rootpath):
         if filename in filename_list:
             output = os.path.join(dirpath, filename)
             break
     if output is None:
-        raise FileNotFoundError("Unable to find {} in {}".format(filename, os.getcwd()))  # pragma: no cover
+        raise FileNotFoundError("Unable to find {} in {}".format(filename, os.getcwd())) # pragma: no cover
     return output
 
 
@@ -60,7 +57,7 @@ def test_setprogramoptions(filename="config.ini"):
     print("Bash Output")
     print("-----------")
     option_list = parser.gen_option_list(section_name, generator="bash")
-    print( " \\\n    ".join(option_list) )
+    print(" \\\n    ".join(option_list))
 
     print("")
     print("CMake Fragment")
@@ -85,13 +82,15 @@ def parse_section(parser, section):
     pprint(data, width=120)
 
     # Print the loginfo from the last search (change if to True to enable)
-    if(False):
+    if (False):
         print("\nLogInfo")
         print("-------")
         #parser._loginfo_print(pretty=True)
 
         # Filter out just the entry and exits for handlers
-        handler_list = [ (d['type'], d['name']) for d in parser._loginfo if d['type'] in ['handler-entry','handler-exit']]
+        handler_list = [
+            (d['type'], d['name']) for d in parser._loginfo if d['type'] in ['handler-entry', 'handler-exit']
+        ]
         pprint(handler_list, width=120)
 
     return data
@@ -112,4 +111,3 @@ def main():
 if __name__ == "__main__":
     main()
     print("Done.")
-

exec-reformat.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# Source the common helpers script
+source scripts/common.bash
+
+printf "${yellow}"
+print_banner "Reformatting - Started"
+printf "${normal}\n"
+
+exclude_dirs=(
+    .git
+    doc
+    __pycache__
+    deps
+    venv-*
+)
+
+exclude_opts=()
+for exc in ${exclude_dirs[*]}; do
+    exclude_opts+=("-e")
+    exclude_opts+=("${exc}")
+done
+
+execute_command "yapf -vv -i -p -r ${exclude_opts[*]} ."
+
+printf "${yellow}"
+print_banner "Reformatting - Done"
+printf "${normal}\n"
+

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "setprogramoptions"
-version = "0.3.0"
+version = "0.3.1"
 description = "Program options helper."
 authors = [
     "William McLendon <wcmclen@sandia.gov>"