Merge pull request #123 from AD-SDL/dev

v0.6.0 - Data Management; Cleanup

Author: RyanTheRobothead

.eslintrc.js

@@ -0,0 +1,12 @@
+/* eslint-env node */
+require('@rushstack/eslint-patch/modern-module-resolution')
+
+module.exports = {
+  extends: [
+    'eslint:recommended',
+    'plugin:vue/vue3-essential',
+    '@typescript-eslint/recommended',
+    '@vue/eslint-config-prettier',
+    '@vue/eslint-config-typescript'
+  ]
+}

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: nbstripout
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.10
+    rev: v0.5.5
     hooks:
       # Run the linter.
       - id: ruff

Makefile

@@ -24,7 +24,7 @@ checks: # Runs all the pre-commit checks
 
 test: init .env build # Runs all the tests
 	@docker compose up -d
-	@docker compose run wei_engine pytest -p no:cacheprovider wei
+	@docker compose run test_wei_server pytest -p no:cacheprovider wei
 	@#docker compose down
 
 clean:

compose.yaml

@@ -30,48 +30,31 @@ services:
   #####################
   # WEI Core Services #
   #####################
-  wei_server:
+  test_wei_server:
     image: ${IMAGE}
     build:
       context: .
       dockerfile: ${DOCKERFILE}
       tags:
         - ${IMAGE}:latest
         - ${IMAGE}:dev
-    container_name: wei_server
+    container_name: test_wei_server
     ports:
       - 8000:8000
     volumes:
       - diaspora_config:/home/app/.diaspora
       - ./tests/workcells:/workcell_defs
       - ~/.wei:/home/app/.wei
-
     environment:
       - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
       - USER_ID=${USER_ID:-1000}
       - GROUP_ID=${GROUP_ID:-1000}
     command: python3 -m wei.server --workcell /workcell_defs/${WORKCELL_FILENAME}
     depends_on:
-      - wei_redis
-  wei_engine:
-    image: ${IMAGE}
-    container_name: wei_engine
-    volumes:
-      - diaspora_config:/home/app/.diaspora
-      - ./tests/workcells:/workcell_defs
-      - ~/.wei:/home/app/.wei
-      - ./:/home/app/wei # for development only
-    environment:
-      - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
-      - USER_ID=${USER_ID:-1000}
-      - GROUP_ID=${GROUP_ID:-1000}
-    command: python3 -m wei.engine --workcell /workcell_defs/${WORKCELL_FILENAME}
-    depends_on:
-      - wei_redis
-      - wei_server
-  wei_redis:
+      - test_wei_redis
+  test_wei_redis:
     image: redis
-    container_name: wei_redis
+    container_name: test_wei_redis
     ports:
       - 6379:6379
     volumes:

package-lock.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "prettier": "^3.3.2"
+  }
+}

package.json

@@ -1,6 +1,6 @@
 [project]
 name = "ad_sdl.wei"
-version = "0.5.9"
+dynamic = ["version"]
 description = "The Rapid Prototyping Laboratory's Workflow Execution Interface."
 authors = [
     {name = "Rafael Vescovi", email = "ravescovi@anl.gov"},
@@ -72,6 +72,8 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
 package-dir = {"wei" = "src/wei"}
+[tool.setuptools.dynamic]
+version = {attr = "wei.__version__"}
 
 #####################
 # Development Tools #

pyproject.toml

@@ -3,19 +3,19 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-export {}
+export { }
 
 declare module 'vue' {
   export interface GlobalComponents {
     Dashboard: typeof import('./src/components/Dashboard.vue')['default']
     Event: typeof import('./src/components/Event.vue')['default']
     Experiments: typeof import('./src/components/Experiments.vue')['default']
-    LocationsColumn: typeof import('./src/components/LocationsColumn.vue')['default']
-    ModuleColumn: typeof import('./src/components/ModuleColumn.vue')['default']
+    LocationsPanel: typeof import('./src/components/LocationsPanel.vue')['default']
+    ModulesPanel: typeof import('./src/components/ModulesPanel.vue')['default']
     ModuleModal: typeof import('./src/components/ModuleModal.vue')['default']
     Workflow: typeof import('./src/components/Workflow.vue')['default']
     WorkflowModal: typeof import('./src/components/WorkflowModal.vue')['default']
-    WorkflowsColumn: typeof import('./src/components/WorkflowsColumn.vue')['default']
+    WorkflowsPanel: typeof import('./src/components/WorkflowsPanel.vue')['default']
     WorkflowTable: typeof import('./src/components/WorkflowTable.vue')['default']
   }
 }