Merge pull request #71 from kif/2024.2

2024.2

build-doc.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+import os
+import sys
+import logging
+import bootstrap
+from sphinx.cmd.build import main
+logger = logging.getLogger(__name__)
+PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
+PROJECT_NAME = bootstrap.get_project_name(PROJECT_DIR)
+logger.info("Project name: %s", PROJECT_NAME)
+LIBPATH = bootstrap.build_project(PROJECT_NAME, PROJECT_DIR)
+if __name__ == '__main__':
+    sys.path.insert(0, LIBPATH)
+    dest_dir = os.path.join(PROJECT_DIR, "build", "sphinx")
+    if not os.path.isdir(dest_dir):
+        os.makedirs(dest_dir)
+
+    argv = ["-b", "html",
+            os.path.join(PROJECT_DIR,"doc","source"),
+            dest_dir ]
+    print(argv)
+    sys.exit(main(argv))

doc/source/conf.py

@@ -131,7 +131,7 @@
 master_doc = 'index'
 
 # General information about the project.
-from dahu._version import strictversion, version, __date__ as _date
+from dahu.version import strictversion, version, __date__ as _date
 year = _date.split("/")[-1]
 copyright = u'2014-%s, Data analysis unit, European Synchrotron Radiation Facility, Grenoble' % year
 

pyproject.toml

@@ -27,6 +27,10 @@ classifiers = ["Development Status :: 3 - Alpha",
                "Programming Language :: Python :: 3.6",
                "Programming Language :: Python :: 3.7",
                "Programming Language :: Python :: 3.8",
+               "Programming Language :: Python :: 3.9",
+               "Programming Language :: Python :: 3.10",
+               "Programming Language :: Python :: 3.11",
+               "Programming Language :: Python :: 3.12",
                "Programming Language :: Python :: Implementation :: CPython",
                "Topic :: Scientific/Engineering :: Physics",
                "Topic :: Software Development :: Libraries :: Python Modules",

src/dahu/app/reprocess.py

@@ -4,7 +4,7 @@
 Reprocess a job using the current
 """
 
-import os, json, sys, logging, time
+import os, json, logging, time
 from argparse import ArgumentParser
 import dahu.factory
 from dahu.job import Job
@@ -105,7 +105,7 @@ def process(args):
         print(result)
         basename = os.path.join(working_dir, "%05i_%s" % (idx, plugin.get_name()))
         with open(basename + ".out", "w") as fp:
-	        fp.write(result)
+            fp.write(result)
         with open(basename + ".inp", "w") as fp:
             json.dump(plugin.input, fp, indent=4, cls=NumpyEncoder)