Merge pull request #117 from DigitalSlideArchive/fix-setup.py

manthey · web-flow · commit b7ca339bdfa2 · 2021-12-08T10:44:54.000-05:00
Fix analysis extras.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,6 +62,13 @@ jobs:
       - tox:
           env: py39
       - coverage
+  noanalysis:
+    executor: toxandnode
+    steps:
+      - checkout
+      - tox:
+          env: noanalysis
+      - coverage
   lint_and_docs:
     executor: toxandnode
     steps:
@@ -111,6 +118,13 @@ workflows:
             branches:
               ignore:
                 - gh-pages
+      - noanalysis:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore:
+                - gh-pages
       - lint_and_docs:
           filters:
             tags:
diff --git a/.gitignore b/.gitignore
@@ -50,4 +50,5 @@ venv/
 ENV/
 
 node_modules/
-tests/externaldata
+
+.pre-commit-config.yaml
diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ Prerequisites:
 
 .. code-block:: bash
 
-  pip install histomicsui --find-links https://girder.github.io/large_image_wheels
+  pip install histomicsui[analysis] --find-links https://girder.github.io/large_image_wheels
   girder build
   girder serve
 
diff --git a/setup.py b/setup.py
@@ -41,11 +41,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.9',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.4.2',
+        'girder-large-image-annotation==1.8.11',
+        'girder-slicer-cli-web>=1.2.3',
     ],
     extras_require={
         'analysis': [
-            'girder-slicer-cli-web[girder]>=1.2.0',
+            'girder-slicer-cli-web[girder]>=1.2.3',
         ],
     },
     license='Apache Software License 2.0',
diff --git a/tests/web_client_specs/analysisSpec.js b/tests/web_client_specs/analysisSpec.js
@@ -2,7 +2,7 @@
 
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 girderTest.promise.done(function () {
diff --git a/tests/web_client_specs/annotationSpec.js b/tests/web_client_specs/annotationSpec.js
@@ -1,6 +1,6 @@
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 function asciiToUint8Array(text) {
diff --git a/tests/web_client_specs/girderUISpec.js b/tests/web_client_specs/girderUISpec.js
@@ -1,4 +1,4 @@
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 
 girderTest.startApp();
 
diff --git a/tests/web_client_specs/huiSpec.js b/tests/web_client_specs/huiSpec.js
@@ -1,6 +1,6 @@
 /* globals girder, girderTest, describe, it, expect, waitsFor, runs */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 
 girderTest.startApp();
 
diff --git a/tests/web_client_specs/itemSpec.js b/tests/web_client_specs/itemSpec.js
@@ -1,6 +1,6 @@
 /* globals girder, girderTest, describe, it, expect, waitsFor, runs */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 
 girderTest.startApp();
 
diff --git a/tests/web_client_specs/metadataPanelSpec.js b/tests/web_client_specs/metadataPanelSpec.js
@@ -1,6 +1,6 @@
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 girderTest.promise.done(function () {
diff --git a/tests/web_client_specs/metadataPlotSpec.js b/tests/web_client_specs/metadataPlotSpec.js
@@ -1,6 +1,6 @@
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 girderTest.promise.done(function () {
diff --git a/tests/web_client_specs/overviewPanelSpec.js b/tests/web_client_specs/overviewPanelSpec.js
@@ -1,6 +1,6 @@
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 girderTest.promise.done(function () {
diff --git a/tests/web_client_specs/panelLayoutSpec.js b/tests/web_client_specs/panelLayoutSpec.js
@@ -1,6 +1,6 @@
 /* global huiTest */
 
-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');
 girderTest.addScript('/static/built/plugins/histomicsui/huiTest.js');
 
 girderTest.promise.done(function () {
diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,6 @@ deps =
   pytest-cov
   pytest-girder>=3.0.5
   pytest-xdist
-  celery!=4.4.4,<5
   urllib3<1.26
   -rrequirements-dev.txt
 extras =
@@ -36,6 +35,9 @@ setenv =
   NPM_CONFIG_PREFER_OFFLINE=true
   PIP_FIND_LINKS=https://girder.github.io/large_image_wheels
 
+[testenv:noanalysis]
+extras =
+
 [testenv:flake8]
 skipsdist = true
 skip_install = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-girderTest.importPlugin('jobs', 'worker', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');`
	`1`	`+girderTest.importPlugin('jobs', 'large_image', 'large_image_annotation', 'slicer_cli_web', 'histomicsui');`
`2`	`2`
`3`	`3`	`girderTest.startApp();`
`4`	`4`