large-image-source-dicom 1.27.1.dev7__tar.gz → 1.27.1.dev19__tar.gz

{large-image-source-dicom-1.27.1.dev7 → large-image-source-dicom-1.27.1.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev7
+Version: 1.27.1.dev19
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-dicom-1.27.1.dev7 → large-image-source-dicom-1.27.1.dev19}/large_image_source_dicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev7
+Version: 1.27.1.dev19
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-dicom-1.27.1.dev19/large_image_source_dicom.egg-info/requires.txt

@@ -0,0 +1,5 @@
+large-image>=1.27.1.dev19
+wsidicom>=0.9.0
+
+[girder]
+girder-large-image>=1.27.1.dev19

large-image-source-dicom-1.27.1.dev19/test_dicom/test_web_client.py

@@ -0,0 +1,38 @@
+import os
+import sys
+import tempfile
+
+import pytest
+
+# We support Python 3.9 and greater for DICOMweb
+pytestmark = [
+    pytest.mark.skipif(sys.version_info < (3, 9), reason='requires python3.9 or higher'),
+    pytest.mark.skipif(os.getenv('DICOMWEB_TEST_URL') is None,
+                       reason='DICOMWEB_TEST_URL is not set'),
+]
+
+
+@pytest.mark.girder()
+@pytest.mark.girder_client()
+@pytest.mark.plugin('large_image')
+@pytest.mark.plugin('dicomweb')
+def testDICOMWebClient(boundServer, fsAssetstore, db):
+    from pytest_girder.web_client import runWebClientTest
+
+    spec = os.path.join(os.path.dirname(__file__), 'web_client_specs', 'dicomWebSpec.js')
+
+    # Replace the template variables
+    with open(spec, 'r') as rf:
+        data = rf.read()
+
+    dicomweb_test_url = os.environ['DICOMWEB_TEST_URL']
+    data = data.replace('DICOMWEB_TEST_URL', f"'{dicomweb_test_url}'")
+
+    # Need to avoid context manager for this to work on Windows
+    tf = tempfile.NamedTemporaryFile(delete=False)
+    try:
+        tf.write(data.encode())
+        tf.close()
+        runWebClientTest(boundServer, tf.name, 15000)
+    finally:
+        os.remove(tf.name)

{large-image-source-dicom-1.27.1.dev7 → large-image-source-dicom-1.27.1.dev19}/test_dicom/web_client_specs/dicomWebSpec.js

@@ -1,3 +1,6 @@
+// These will be replaced by templating
+const url = DICOMWEB_TEST_URL;
+
 girderTest.importPlugin('jobs', 'large_image', 'dicomweb');
 
 girderTest.startApp();
@@ -15,7 +18,7 @@ describe('DICOMWeb assetstore', function () {
         var destinationType;
 
         // After importing, we will verify that this item exists
-        const verifyItemName = '1.3.6.1.4.1.5962.99.1.3510881361.982628633.1635598486609.2.0';
+        const verifyItemName = '1.3.6.1.4.1.5962.99.1.3205815762.381594633.1639588388306.2.0';
 
         runs(function () {
             $('a.g-nav-link[g-target="admin"]').trigger('click');
@@ -40,7 +43,7 @@ describe('DICOMWeb assetstore', function () {
         runs(function () {
             // Create the DICOMweb assetstore
             $('#g-new-dwas-name').val('DICOMweb');
-            $('#g-new-dwas-url').val('https://idc-external-006.uc.r.appspot.com/dcm4chee-arc/aets/DCM4CHEE/rs');
+            $('#g-new-dwas-url').val(url);
 
             // Test error for setting auth type to "token" with no token
             $('#g-new-dwas-auth-type').val('token');

large-image-source-dicom-1.27.1.dev7/large_image_source_dicom.egg-info/requires.txt

@@ -1,5 +0,0 @@
-large-image>=1.27.1.dev7
-wsidicom>=0.9.0
-
-[girder]
-girder-large-image>=1.27.1.dev7

large-image-source-dicom-1.27.1.dev7/test_dicom/test_web_client.py

@@ -1,21 +0,0 @@
-import os
-import sys
-
-import pytest
-
-# We support Python 3.9 and greater for DICOMweb
-pytestmark = [
-    pytest.mark.skipif(sys.version_info < (3, 9), reason='requires python3.9 or higher'),
-]
-
-
-@pytest.mark.skip(reason='the remote server we test with is down as of 2023-12-17')
-@pytest.mark.girder()
-@pytest.mark.girder_client()
-@pytest.mark.plugin('large_image')
-@pytest.mark.plugin('dicomweb')
-def testDICOMWebClient(boundServer, fsAssetstore, db):
-    from pytest_girder.web_client import runWebClientTest
-
-    spec = os.path.join(os.path.dirname(__file__), 'web_client_specs', 'dicomWebSpec.js')
-    runWebClientTest(boundServer, spec, 15000)