Merge branch 'main' into file_staging

Author: hategan

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    versioning-strategy: auto
+    allow:
+      - dependency-name: "filelock"
+      - dependency-name: "psutil"
+      - dependency-name: "pystache"
+      - dependency-name: "typeguard"
+      - dependency-name: "packaging"
+      

.github/workflows/codespell.yml

@@ -15,3 +15,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: codespell-project/actions-codespell@master
+        with:
+          ignore_words_list: assertIn

.github/workflows/python-package.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, 3.10]
+        python-version: [3.8, 3.9, 3.10, 3.11, 3.12]
     runs-on: ubuntu-latest
 
     steps:

.gitignore

@@ -20,3 +20,4 @@ build/
 .packages/
 docs/.web-build
 web-build/
+.packages/

.mypy

@@ -16,6 +16,3 @@ ignore_missing_imports = True
 
 [mypy-pystache.*]
 ignore_missing_imports = True
-
-[mypy-typing_compat.*]
-ignore_missing_imports = True

MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

QuickStart.md

@@ -7,13 +7,13 @@ This document will guide you through the install procedure and your first Hello
 - [Hello World example](#hello-world)
 
 ## Requirements
-- python3.7+
+- python3.8+
 
 ## Install PSI/J
 
 If you have conda installed you might want to start from a fresh environment. This part is not installing PSI/J but setting up a new environment with the specified python version:
 
-1. `conda create -n psij python=3.7`
+1. `conda create -n psij python=3.8`
 2. `conda activate psij`
 
 
@@ -35,7 +35,7 @@ Install PSI/J from the GitHub repository:
 ## Hello World
 
 **Requirements**
-- python3.7
+- python3.8
 - Job executor, e.g. Slurm in this example
 
 **Steps**
@@ -58,7 +58,7 @@ def make_job():
     spec.arguments = ['HELLO WORLD!']
 
     # set project name if no default is specified
-    # spec.attributes.project_name = <PROJECT_NAME>
+    # spec.attributes.account = <PROJECT_NAME>
 
     # set queue if no default is specified
     # spec.attributes.queue_name = <QUEUE_NAME>

docs/_static/extras.js

@@ -86,8 +86,8 @@ function detectAll(selectorType) {
             else if (text == "queue_name") {
                 $(this).text("QUEUE_NAME");
             }
-            else if (text == "project_name") {
-                $(this).text("PROJECT_NAME");
+            else if (text == "account") {
+                $(this).text("ACCOUNT");
             }
         }
         if (text == '_get_executor_instance') {

docs/conf.py

@@ -31,7 +31,8 @@
 autodoc_mock_imports = ['flux']
 nitpick_ignore = [
     ('py:class', 'distutils.version.StrictVersion'),
-    ('py:class', 'distutils.version.Version')
+    ('py:class', 'distutils.version.Version'),
+    ('py:class', 'packaging.version.Version')
 ]
 
 if web_docs:

docs/development/tutorial_add_executor.rst

@@ -68,11 +68,11 @@ Create a simple BatchSchedulerExecutor subclass that does nothing new in `psijpb
 
 and create a descriptor file to tell PSI/J about this, ``psij-descriptors/pbspro.py``::
 
-  from distutils.version import StrictVersion
+  from packaging.version import Version
 
   from psij._descriptor import _Descriptor
 
-  __PSI_J_EXECUTORS__ = [_Descriptor(name='pbspro', version=StrictVersion('0.0.1'),
+  __PSI_J_EXECUTORS__ = [_Descriptor(name='pbspro', version=Version('0.0.1'),
                                      cls='psijpbs.pbspro.PBSProJobExecutor')]
 
 Now, run the test suite. It should fail with an error reporting that the resource manager specific methods of BatchSchedulerExecutor have not been implemented::