Merge pull request #2168 from SasView/2164-update-config-from-list-of…

…-variables-to-class

2164 update config from list of variables to class

.github/workflows/docs.yml

@@ -93,7 +93,7 @@ jobs:
       run: |
         # SET SASVIEW GITHASH
         githash=$( git rev-parse HEAD )
-        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py
+        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/system/version.py
         # BUILD SASVIEW
         python setup.py clean
         python setup.py build

.github/workflows/installers.yml

@@ -150,7 +150,7 @@ jobs:
       run: |
         # SET SASVIEW GITHASH
         githash=$( git rev-parse HEAD )
-        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py
+        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/system/version.py
         # BUILD SASVIEW
         python setup.py clean
         python setup.py build

.github/workflows/release.yml

@@ -146,7 +146,7 @@ jobs:
       run: |
         # SET SASVIEW GITHASH
         githash=$( git rev-parse HEAD )
-        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py
+        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/system/version.py
         # BUILD SASVIEW
         python setup.py clean
         python setup.py build

.github/workflows/test.yml

@@ -107,7 +107,7 @@ jobs:
       run: |
         # SET SASVIEW GITHASH
         githash=$( git rev-parse HEAD )
-        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py
+        sed -i.bak s/GIT_COMMIT/$githash/g src/sas/system/version.py
         # BUILD SASVIEW
         python setup.py clean
         python setup.py build

.gitignore

@@ -30,7 +30,6 @@
 *.so
 *.exe
 
-/.vagrant
 /build
 /dist
 sasview.egg-info
@@ -39,6 +38,7 @@ default_categories.json
 /setup.cfg
 **/UI/*.py
 !**/UI/__init__.py
+config.json
 
 # doc build
 /docs/sphinx-docs/build

build_tools/release_automation.py

@@ -135,29 +135,31 @@ def generate_zenodo(sasview_data, zenodo_api_key):
                                                             "and attach to Zenodo release record.\n- Publish Zenodo record")
     return newDOI
 
-def update_sasview_init(version, doi):
-    """
+version_template = \
+"""
+__version__ = "%s"
+__release_date__ = "%i"
+__build__ = "GIT_COMMIT"
+"""
 
-    :return:
+zenodo_template = '__DOI__ = "%s"'
+
+def update_sasview_metadata(version, doi):
+    """
+    Update version and zenodo DOI
     """
 
-    init_file = os.path.join('sasview','src', 'sas', 'sasview', '__init__.py')
-    output_lines = []
+    system_directory = "sasview/src/sas/system"
+    version_filename = os.path.join(system_directory, "version.py")
+    zenodo_filename = os.path.join(system_directory, "zenodo.py")
+
     year = datetime.datetime.now().year
-    with open(init_file, 'r') as f:
-        for line in f.readlines():
-            if line[:11] in '__version__':
-               output_lines.append('__version__ = \"'+version+'\"\n')
-            elif line[:7] in '__DOI__' :
-                output_lines.append('__DOI__ = \"Zenodo, ' + str(doi) + '\"\n')
-            elif line[:16] in '__release_date__':
-                output_lines.append('__release_date__ = \"' + str(year) + '\"\n')
-            else:
-                output_lines.append(line)
 
-    with open(init_file, 'w') as f:
-        f.writelines(output_lines)
+    with open(version_filename, 'w') as file:
+        file.write(version_template % (version, year))
 
+    with open(zenodo_filename, 'w') as file:
+        file.write(zenodo_template % doi)
 
 def update_sasmodels_init(version):
     """
@@ -241,7 +243,7 @@ def prepare_release_notes(issues_list, repository, username, password):
         zenodo_api_key = args.zenodo
         new_doi = generate_zenodo(sasview_data, zenodo_api_key)
 
-    update_sasview_init(sasview_version, new_doi)
+    update_sasview_metadata(sasview_version, new_doi)
     update_sasmodels_init(sasmodels_version)
 
     year = datetime.datetime.now().year

build_tools/requirements.txt

@@ -32,3 +32,4 @@ html5lib
 importlib-resources
 bumps
 html2text
+jsonschema

docs/sphinx-docs/source/_extensions/mathjax.py

@@ -106,7 +106,6 @@ def setup(app):
     app.add_config_value('mathjax_path',
                          'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?'
                          'config=TeX-MML-AM_CHTML',
-                         #'config=TeX-AMS-MML_HTMLorMML',
                          False)
     app.add_config_value('mathjax_css', None, 'html')
     app.add_config_value('mathjax_use_katex', False, 'html')