New UI for creating and editing views

.circleci/config.yml

@@ -9,8 +9,11 @@ commands:
   tox:
     description: "Run tox"
     parameters:
-      env:
+      toxenv:
         type: string
+      environ:
+        type: string
+        default: ""
     steps:
       - run:
           name: Upgrade pip
@@ -25,9 +28,10 @@ commands:
           name: Run tests via tox
           # Piping through cat does less buffering of the output but can
           # consume the exit code
-          # command: PYTEST_ADDOPTS=--forked tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
-          # command: PYTEST_ADDOPTS="--reruns=3 --numprocesses=0" tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
-          command: COVERAGE_CORE=sysmon PYTEST_NUMPROCESSES=3 PYTEST_ADDOPTS="--reruns=3" tox -e << parameters.env >> | cat; test ${PIPESTATUS[0]} -eq 0
+          # command: PYTEST_ADDOPTS=--forked tox -e << parameters.toxenv >> | cat; test ${PIPESTATUS[0]} -eq 0
+          # command: PYTEST_ADDOPTS="--reruns=3 --numprocesses=0" tox -e << parameters.toxenv >> | cat; test ${PIPESTATUS[0]} -eq 0
+          command: _JAVA_OPTIONS="-Xmx2g" LARGE_IMAGE_CACHE_TILESOURCE_MAXIMUM=3 COVERAGE_CORE=sysmon PYTEST_NUMPROCESSES=3 PYTEST_ADDOPTS="--reruns=3" << parameters.environ >> tox -e << parameters.toxenv
+            >> | cat; test ${PIPESTATUS[0]} -eq 0
   switchpython:
     description: "Upgrade python"
     parameters:
@@ -38,7 +42,8 @@ commands:
           name: Upgrade pyenv
           command: |
             sudo rm -rf /opt/circleci/.pyenv
-            curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+            sudo bash -c 'curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | PYENV_ROOT=/opt/circleci/.pyenv bash'
+            sudo chmod -R 777 /opt/circleci/.pyenv/
             pyenv install --list list
       - run:
           name: Use pyenv to install python
@@ -75,7 +80,7 @@ commands:
             docker-compose -f ./.circleci/dcm4chee/auth-docker-compose.yml up -d
             export DICOMWEB_TEST_URL=http://localhost:8008/dcm4chee-arc/aets/DCM4CHEE/rs
             echo "export DICOMWEB_TEST_URL=$DICOMWEB_TEST_URL" >> $BASH_ENV
-            pip install dicomweb_client 'python-keycloak<4.1'
+            pip install dicomweb_client tenacity 'python-keycloak<4.1'
 
             # Wait up to 60 seconds for keycloak to be ready
             echo 'Waiting for keycloak to start...'
@@ -114,13 +119,21 @@ commands:
           command: |
             echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
             echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
+      - restore_cache:
+          name: Restore nvm cache
+          key: v1-nvm-cache-<< parameters.node >>
       - run:
           name: Switch node versions
           command: |
             nvm install << parameters.node >>
             nvm alias default << parameters.node >>
             NODE_DIR=$(dirname $(which node))
             echo "export PATH=$NODE_DIR:\$PATH" >> $BASH_ENV
+      - save_cache:
+          name: Save nvm cache
+          key: v1-nvm-cache-<< parameters.node >>
+          paths:
+            - /opt/circleci/.nvm/.cache
       - run:
           name: Check node versions
           command: |
@@ -152,73 +165,75 @@ jobs:
           command: |
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             docker push girder/tox-and-node:latest
-  py38:
+  py310:
     machine:
       image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout
       - allservices:
-          version: "3.8"
+          version: "3.10"
           node: v14
       - tox:
-          env: test-py38
+          toxenv: test-py310
       - coverage
       - store_artifacts:
           path: build/test/artifacts
-  py39:
+  py311:
     machine:
       image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout
       - allservices:
-          version: "3.9"
+          version: "3.11"
           node: v14
       - tox:
-          env: test-py39
+          toxenv: test-py311
       - coverage
       - store_artifacts:
           path: build/test/artifacts
-  py310:
+  py312:
     machine:
       image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout
       - allservices:
-          version: "3.10"
+          version: "3.12"
           node: v14
       - tox:
-          env: test-py310
+          toxenv: test-py312
       - coverage
       - store_artifacts:
           path: build/test/artifacts
-  py311:
+  py313:
     machine:
       image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout
       - allservices:
-          version: "3.11"
+          version: "3.13"
           node: v14
       - tox:
-          env: test-py311
+          toxenv: test-py313
+          # environ: TOX_VERBOSE=4 TOX_PREFER_BINARY=1
       - coverage
       - store_artifacts:
           path: build/test/artifacts
-  py312:
+  py314:
     machine:
       image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout
       - allservices:
-          version: "3.12"
+          version: "3.14"
           node: v14
       - tox:
-          env: test-py312
+          toxenv: test-py314
+          # environ: TOX_VERBOSE=4 TOX_PREFER_BINARY=1
       - coverage
       - store_artifacts:
           path: build/test/artifacts
@@ -233,7 +248,7 @@ jobs:
           name: Permissions for link checker
           command: find /root -type d -exec chmod 755 {} \+
       - tox:
-          env: docs,lint,lintclient,notebook
+          toxenv: docs,lint,lintclient,notebook
       - store_artifacts:
           path: build/docs
       - persist_to_workspace:
@@ -245,7 +260,7 @@ jobs:
     steps:
       - checkout
       - tox:
-          env: compare-py311
+          toxenv: compare-py313
       - store_artifacts:
           path: build/tox/compare.txt
       - store_artifacts:
@@ -256,7 +271,7 @@ jobs:
     steps:
       - checkout
       - tox:
-          env: type
+          toxenv: type
   wheels:
     executor: toxandnode
     steps:
@@ -337,35 +352,35 @@ workflows:
                 - master
                 # Create a branch of this name to push to docker hub
                 - testdocker
-      - py38:
+      - py310:
           filters:
             tags:
               only: /^v.*/
             branches:
               ignore:
                 - gh-pages
-      - py39:
+      - py311:
           filters:
             tags:
               only: /^v.*/
             branches:
               ignore:
                 - gh-pages
-      - py310:
+      - py312:
           filters:
             tags:
               only: /^v.*/
             branches:
               ignore:
                 - gh-pages
-      - py311:
+      - py313:
           filters:
             tags:
               only: /^v.*/
             branches:
               ignore:
                 - gh-pages
-      - py312:
+      - py314:
           filters:
             tags:
               only: /^v.*/
@@ -410,26 +425,28 @@ workflows:
       - release:
           requires:
             - check_release
-            - py38
-            - py39
             - py310
             - py311
             - py312
+            - py313
+            - py314
             - lint_and_docs
             - type
             - wheels
           filters:
             tags:
               only: /^v.*/
             branches:
-              only: master
+              only:
+                - master
+                - girder-5
       - docs-deploy:
           requires:
-            - py38
-            - py39
             - py310
             - py311
             - py312
+            - py313
+            - py314
             - lint_and_docs
             - type
             - wheels
@@ -450,11 +467,11 @@ workflows:
               only:
                 - master
     jobs:
-      - py38
-      - py39
       - py310
       - py311
       - py312
+      - py313
+      - py314
       - lint_and_docs
       - type
       - compare

.circleci/dcm4chee/docker-compose.yml

@@ -7,7 +7,7 @@ volumes:
   ldap_config: {}
 services:
   ldap:
-    image: dcm4che/slapd-dcm4chee:2.6.6-33.0
+    image: dcm4che/slapd-dcm4chee:2.6.5-31.2
     logging:
       driver: json-file
       options:
@@ -20,7 +20,7 @@ services:
       - ldap_data:/var/lib/openldap/openldap-data
       - ldap_config:/etc/openldap/slapd.d
   db:
-    image: dcm4che/postgres-dcm4chee:16.4-33
+    image: dcm4che/postgres-dcm4chee:15.4-31
     logging:
       driver: json-file
       options:
@@ -34,7 +34,7 @@ services:
     volumes:
       - db_data:/var/lib/postgresql/data
   arc:
-    image: dcm4che/dcm4chee-arc-psql:5.33.0
+    image: dcm4che/dcm4chee-arc-psql:5.31.2
     logging:
       driver: json-file
       options:

.circleci/dcm4chee/upload_example_data.py

@@ -6,6 +6,7 @@
 from dicomweb_client import DICOMwebClient
 from pydicom import dcmread
 from requests import Session
+from tenacity import Retrying, stop_after_attempt, wait_exponential
 
 
 def upload_example_data(server_url, token=None):
@@ -22,8 +23,11 @@ def upload_example_data(server_url, token=None):
 
     datasets = []
     for url in download_urls:
-        resp = urllib.request.urlopen(url)
-        data = resp.read()
+        for attempt in Retrying(stop=stop_after_attempt(5),
+                                wait=wait_exponential(multiplier=1, min=0.5, max=5)):
+            with attempt:
+                resp = urllib.request.urlopen(url)
+                data = resp.read()
         dataset = dcmread(BytesIO(data))
         datasets.append(dataset)
 

.circleci/release_pypi.sh

@@ -5,7 +5,12 @@ set -e
 ROOTPATH=`pwd`
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=`python -m setuptools_scm | sed "s/.* //"`
-if [ ${CIRCLE_BRANCH-:} = "master" ]; then export SETUPTOOLS_SCM_PRETEND_VERSION=`echo $SETUPTOOLS_SCM_PRETEND_VERSION | sed "s/\+.*$//"`; fi
+if [ "${CIRCLE_BRANCH-:}" = "master" ]; then
+    export SETUPTOOLS_SCM_PRETEND_VERSION=`echo $SETUPTOOLS_SCM_PRETEND_VERSION | sed "s/\+.*$//"`
+elif [ "${CIRCLE_BRANCH-:}" == "girder-5" ]; then
+    pip install setuptools-scm
+    export SETUPTOOLS_SCM_PRETEND_VERSION=$(python -c "import setuptools_scm,re;print(re.sub(r'(\d+\.\d+\.\d+\.)dev(\d+)(\+.*$)', r'\1a\2', setuptools_scm.get_version()))")
+fi
 
 python setup.py sdist
 pip wheel . --no-deps -w dist

.git-blame-ignore-revs

@@ -17,3 +17,7 @@ dcda95e659a4eaa73cae85ab02f1b89059e63c32
 f517ecb2b7d8c454d1374156452be42b87ca3fd1
 # PR 1604: Handle ruff linting rule changes
 e62083dab9a190d94841b3f4089850f43e2c9932
+# PR 1757: Several small code readability changes
+21989961c1f3dcd9630ca434f7664143dc4c4015
+# PR 1950: Drop support for Python 3.8
+928e5c21c07c179a76ba29083419f924d7332a13

.github/workflows/docker.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository )
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Log into the Container registry
@@ -50,7 +50,7 @@ jobs:
           - "jupyter"
           - "jupyter-geo"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Log into the Container registry