Merge branch 'master' of https://github.com/jupyterhub/batchspawner into jupyterhub-3.0.0b1

Author: ryanlovett

.github/workflows/test.yml

@@ -32,14 +32,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.5"
-          - "3.9"
+          - "3.6"
+          - "3.10"
         JHUB_VER:
-          - "0.9.6"
           - "1.0.0"
-          - "1.1.0"
-          - "1.2.0"
-          - "1.3.0"
+          - "1.5.1"
+          - "2.3.1"
         allow_failure: [false]
 
         exclude:
@@ -53,6 +51,9 @@ jobs:
           - JHUB_VER: "main"
             python-version: "3.9"
             allow_failure: true
+          - JHUB_VER: "3.0.0"
+            python-version: "3.9"
+            allow_failure: true
 
     steps:
       - uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -10,27 +10,33 @@
 #
 repos:
   # Autoformat: Python code
-  - repo: https://github.com/ambv/black
-    rev: "22.3.0"
+  - repo: https://github.com/psf/black
+    rev: "22.12.0"
     hooks:
       - id: black
-        args: [--target-version=py36]
+        args:
+          - --target-version=py36
+          - --target-version=py37
+          - --target-version=py38
+          - --target-version=py39
+          - --target-version=py310
+          - --target-version=py311
 
   # Autoformat: markdown, yaml
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.2.1
+    rev: v3.0.0-alpha.4
     hooks:
       - id: prettier
 
   # Lint: Python code
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: "3.8.4"
+  - repo: https://github.com/PyCQA/flake8
+    rev: "6.0.0"
     hooks:
       - id: flake8
 
   # Misc...
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.4.0
     # ref: https://github.com/pre-commit/pre-commit-hooks#hooks-available
     hooks:
       # Autoformat: Makes sure files end in a newline and only a newline.
@@ -48,3 +54,8 @@ repos:
 
       # Lint: Checks that non-binary executables have a proper shebang.
       - id: check-executables-have-shebangs
+
+
+# pre-commit.ci config reference: https://pre-commit.ci/#configuration
+ci:
+  autoupdate_schedule: monthly

CHANGELOG.md

@@ -10,6 +10,18 @@ Changed
 
 Fixed
 
+## v1.2
+
+Changed
+
+- PR #237: Replace use of scripts with entry_points
+- PR #208 #238 #239 #240 #241: updates to CI - bumping versions and aligning with Jupyterhub standards
+- PR #220: remove code supporting Jupyterhub earlier than 0.9
+
+Fixed
+
+- PR #229: LSF jobs with multiple slots display each hostname ':' separated
+
 ## v1.1
 
 Added (user)

batchspawner/batchspawner.py

@@ -969,7 +969,7 @@ def state_isrunning(self):
 
     def state_gethost(self):
         if self.job_status:
-            return self.job_status.split(" ")[1].strip()
+            return self.job_status.split(" ")[1].strip().split(":")[0]
 
         self.log.error(
             "Spawner unable to match host addr in job {0} with status {1}".format(

version.py

@@ -3,8 +3,8 @@
 
 version_info = (
     1,
-    1,
-    1,
-    "dev",  # comment-out this line for a release
+    2,
+    0,
+    #    "dev",  # comment-out this line for a release
 )
 __version__ = ".".join(map(str, version_info))