Merge pull request #58 from oarepo/optional-workflow

Making workflows optional again

oarepo_requests/config.py

@@ -8,10 +8,13 @@
     import oarepo_workflows  # noqa
 
     from oarepo_requests.actions.components import WorkflowTransitionComponent
+    from oarepo_workflows.requests.events import WorkflowEvent
 
     workflow_action_components = [WorkflowTransitionComponent]
 except ImportError:
     workflow_action_components = []
+    WorkflowEvent = None
+
 from oarepo_requests.resolvers.ui import (
     FallbackEntityReferenceUIResolver,
     GroupEntityReferenceUIResolver,
@@ -26,7 +29,6 @@
 from invenio_requests.services.permissions import (
     PermissionPolicy as InvenioRequestsPermissionPolicy,
 )
-from oarepo_workflows.requests.events import WorkflowEvent
 
 
 REQUESTS_REGISTERED_TYPES = [
@@ -41,17 +43,18 @@
 
 REQUESTS_ALLOWED_RECEIVERS = ["user", "group", "auto_approve"]
 
-DEFAULT_WORKFLOW_EVENT_SUBMITTERS = {
-    CommentEventType.type_id: WorkflowEvent(
-        submitters=InvenioRequestsPermissionPolicy.can_create_comment
-    ),
-    LogEventType.type_id: WorkflowEvent(
-        submitters=InvenioRequestsPermissionPolicy.can_create_comment
-    ),
-    TopicUpdateEventType.type_id: WorkflowEvent(
-        submitters=InvenioRequestsPermissionPolicy.can_create_comment
-    ),
-}
+if WorkflowEvent:
+    DEFAULT_WORKFLOW_EVENT_SUBMITTERS = {
+        CommentEventType.type_id: WorkflowEvent(
+            submitters=InvenioRequestsPermissionPolicy.can_create_comment
+        ),
+        LogEventType.type_id: WorkflowEvent(
+            submitters=InvenioRequestsPermissionPolicy.can_create_comment
+        ),
+        TopicUpdateEventType.type_id: WorkflowEvent(
+            submitters=InvenioRequestsPermissionPolicy.can_create_comment
+        ),
+    }
 
 ENTITY_REFERENCE_UI_RESOLVERS = {
     "user": UserEntityReferenceUIResolver("user"),

run-tests.sh

@@ -42,6 +42,13 @@ pip install "oarepo[tests]==$OAREPO_VERSION.*"
 pip install -e "./$BUILD_TEST_DIR/${MODEL}"
 pip install oarepo-ui
 pip install deepdiff
+
+# Check if we can import all the sources
+find oarepo_requests -name '*.py' | grep -v '__init__.py' | sed 's/.py$//' | tr '/' '.' | sort -u | while read MODULE ; do
+    echo "import $MODULE"
+done | python
+
+# now install the tests (might bring more dependencies, that's why we have checked the imports before)
 pip install -e ".[tests]"
 
 sh forked_install.sh invenio-records-resources

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.1.0
+version = 2.1.1
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md