diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 440f0579..83a8550d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -92,7 +92,7 @@ jobs: npm run build - name: Install Dependencies, Start React Application - working-directory: aiida_workgraph/web/frontend + working-directory: aiida_workgraph_web/frontend run: | npm install npm run build diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 49e35d57..0415f009 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -31,12 +31,12 @@ jobs: python -m pip install --upgrade pip pip install build - name: Build widget - working-directory: aiida_workgraph/widget/ + working-directory: aiida_workgraph_widget/ run: | npm install npm run build - name: Build web frontend package - working-directory: aiida_workgraph/web/frontend/ + working-directory: aiida_workgraph_web/frontend/ run: | npm install npm run build diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37a30a26..45dcd935 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ which can automatically refresh on changes of the JS files. To start the backend server please run ```console -python aiida_workgraph/web/backend/main.py +python aiida_workgraph_web/backend/main.py ``` then start the frontend server with ```console -npm --prefix aiida_workgraph/web/frontend start +npm --prefix aiida_workgraph_web/frontend start ``` The frontend server will refresh @@ -80,7 +80,7 @@ playwright codegen You might want to clean your cache ```console -npm --prefix aiida_workgraph/web/frontend cache clean +npm --prefix aiida_workgraph_web/frontend cache clean ``` and also clear your browsers cache or try to start new private window. diff --git a/README.md b/README.md index 04870412..f818e41b 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,11 @@ To install the jupyter widget support you need to in addition build the JavaScri ```console pip install .[widget] # build widget -cd aiida_workgraph/widget/ +cd aiida_workgraph_widget/ npm install npm run build # build web frontend -cd ../../aiida_workgraph/web/frontend/ +cd ../../aiida_workgraph_web/frontend/ npm install npm run build ``` @@ -105,10 +105,10 @@ pre-commit install ``` ### Widget -See the [README.md](https://github.com/aiidateam/aiida-workgraph/blob/main/aiida_workgraph/widget/README.md) +See the [README.md](https://github.com/aiidateam/aiida-workgraph/blob/main/aiida_workgraph_widget/README.md) ### Web app -See the [README.md](https://github.com/aiidateam/aiida-workgraph/blob/main/aiida_workgraph/web/README.md) +See the [README.md](https://github.com/aiidateam/aiida-workgraph/blob/main/aiida_workgraph_web/README.md) ## License diff --git a/aiida_workgraph/cli/cmd_web.py b/aiida_workgraph/cli/cmd_web.py index 3788a9ca..7551ae9e 100644 --- a/aiida_workgraph/cli/cmd_web.py +++ b/aiida_workgraph/cli/cmd_web.py @@ -43,7 +43,7 @@ def start(): backend_process = subprocess.Popen( [ "uvicorn", - "aiida_workgraph.web.backend.app.api:app", + "aiida_workgraph_web.backend.app.api:app", "--reload", "--port", "8000", diff --git a/aiida_workgraph/task.py b/aiida_workgraph/task.py index 326f2b50..9bcb76eb 100644 --- a/aiida_workgraph/task.py +++ b/aiida_workgraph/task.py @@ -6,7 +6,7 @@ from aiida_workgraph.sockets import socket_pool if USE_WIDGET: - from aiida_workgraph.widget import NodeGraphWidget + from aiida_workgraph_widget import NodeGraphWidget from aiida_workgraph.collection import ( WorkGraphPropertyCollection, WorkGraphInputSocketCollection, diff --git a/aiida_workgraph/workgraph.py b/aiida_workgraph/workgraph.py index 194fbf12..67463a75 100644 --- a/aiida_workgraph/workgraph.py +++ b/aiida_workgraph/workgraph.py @@ -18,7 +18,7 @@ from typing import Any, Dict, List, Optional, Union if USE_WIDGET: - from aiida_workgraph.widget import NodeGraphWidget + from aiida_workgraph_widget import NodeGraphWidget class WorkGraph(node_graph.NodeGraph): diff --git a/aiida_workgraph/web/README.md b/aiida_workgraph_web/README.md similarity index 100% rename from aiida_workgraph/web/README.md rename to aiida_workgraph_web/README.md diff --git a/aiida_workgraph/web/__init__.py b/aiida_workgraph_web/__init__.py similarity index 100% rename from aiida_workgraph/web/__init__.py rename to aiida_workgraph_web/__init__.py diff --git a/aiida_workgraph/web/backend/__init__.py b/aiida_workgraph_web/backend/__init__.py similarity index 100% rename from aiida_workgraph/web/backend/__init__.py rename to aiida_workgraph_web/backend/__init__.py diff --git a/aiida_workgraph/web/backend/app/__init__.py b/aiida_workgraph_web/backend/app/__init__.py similarity index 100% rename from aiida_workgraph/web/backend/app/__init__.py rename to aiida_workgraph_web/backend/app/__init__.py diff --git a/aiida_workgraph/web/backend/app/api.py b/aiida_workgraph_web/backend/app/api.py similarity index 93% rename from aiida_workgraph/web/backend/app/api.py rename to aiida_workgraph_web/backend/app/api.py index d05b527b..30a10b4f 100644 --- a/aiida_workgraph/web/backend/app/api.py +++ b/aiida_workgraph_web/backend/app/api.py @@ -1,9 +1,9 @@ from fastapi import FastAPI, Request from fastapi.middleware.cors import CORSMiddleware from aiida.manage import manager -from aiida_workgraph.web.backend.app.daemon import router as daemon_router -from aiida_workgraph.web.backend.app.workgraph import router as workgraph_router -from aiida_workgraph.web.backend.app.datanode import router as datanode_router +from aiida_workgraph_web.backend.app.daemon import router as daemon_router +from aiida_workgraph_web.backend.app.workgraph import router as workgraph_router +from aiida_workgraph_web.backend.app.datanode import router as datanode_router from fastapi.staticfiles import StaticFiles from pathlib import Path import os diff --git a/aiida_workgraph/web/backend/app/daemon.py b/aiida_workgraph_web/backend/app/daemon.py similarity index 100% rename from aiida_workgraph/web/backend/app/daemon.py rename to aiida_workgraph_web/backend/app/daemon.py diff --git a/aiida_workgraph/web/backend/app/datanode.py b/aiida_workgraph_web/backend/app/datanode.py similarity index 97% rename from aiida_workgraph/web/backend/app/datanode.py rename to aiida_workgraph_web/backend/app/datanode.py index b93f7c41..38e4f258 100644 --- a/aiida_workgraph/web/backend/app/datanode.py +++ b/aiida_workgraph_web/backend/app/datanode.py @@ -11,7 +11,7 @@ async def read_datanode_data( labelSearch: str = Query(None), ) -> List[Dict[str, Any]]: from aiida.orm import QueryBuilder, Data - from aiida_workgraph.web.backend.app.utils import time_ago + from aiida_workgraph_web.backend.app.utils import time_ago try: builder = QueryBuilder() diff --git a/aiida_workgraph/web/backend/app/utils.py b/aiida_workgraph_web/backend/app/utils.py similarity index 100% rename from aiida_workgraph/web/backend/app/utils.py rename to aiida_workgraph_web/backend/app/utils.py diff --git a/aiida_workgraph/web/backend/app/workgraph.py b/aiida_workgraph_web/backend/app/workgraph.py similarity index 100% rename from aiida_workgraph/web/backend/app/workgraph.py rename to aiida_workgraph_web/backend/app/workgraph.py diff --git a/aiida_workgraph/web/backend/main.py b/aiida_workgraph_web/backend/main.py similarity index 100% rename from aiida_workgraph/web/backend/main.py rename to aiida_workgraph_web/backend/main.py diff --git a/aiida_workgraph/web/frontend/.gitignore b/aiida_workgraph_web/frontend/.gitignore similarity index 100% rename from aiida_workgraph/web/frontend/.gitignore rename to aiida_workgraph_web/frontend/.gitignore diff --git a/aiida_workgraph/web/frontend/.rete-patch b/aiida_workgraph_web/frontend/.rete-patch similarity index 100% rename from aiida_workgraph/web/frontend/.rete-patch rename to aiida_workgraph_web/frontend/.rete-patch diff --git a/aiida_workgraph/web/frontend/README.md b/aiida_workgraph_web/frontend/README.md similarity index 100% rename from aiida_workgraph/web/frontend/README.md rename to aiida_workgraph_web/frontend/README.md diff --git a/aiida_workgraph/web/frontend/package-lock.json b/aiida_workgraph_web/frontend/package-lock.json similarity index 100% rename from aiida_workgraph/web/frontend/package-lock.json rename to aiida_workgraph_web/frontend/package-lock.json diff --git a/aiida_workgraph/web/frontend/package.json b/aiida_workgraph_web/frontend/package.json similarity index 100% rename from aiida_workgraph/web/frontend/package.json rename to aiida_workgraph_web/frontend/package.json diff --git a/aiida_workgraph/web/frontend/public/favicon.ico b/aiida_workgraph_web/frontend/public/favicon.ico similarity index 100% rename from aiida_workgraph/web/frontend/public/favicon.ico rename to aiida_workgraph_web/frontend/public/favicon.ico diff --git a/aiida_workgraph/web/frontend/public/index.html b/aiida_workgraph_web/frontend/public/index.html similarity index 100% rename from aiida_workgraph/web/frontend/public/index.html rename to aiida_workgraph_web/frontend/public/index.html diff --git a/aiida_workgraph/web/frontend/public/manifest.json b/aiida_workgraph_web/frontend/public/manifest.json similarity index 100% rename from aiida_workgraph/web/frontend/public/manifest.json rename to aiida_workgraph_web/frontend/public/manifest.json diff --git a/aiida_workgraph/web/frontend/public/robots.txt b/aiida_workgraph_web/frontend/public/robots.txt similarity index 100% rename from aiida_workgraph/web/frontend/public/robots.txt rename to aiida_workgraph_web/frontend/public/robots.txt diff --git a/aiida_workgraph/web/frontend/src/App.css b/aiida_workgraph_web/frontend/src/App.css similarity index 100% rename from aiida_workgraph/web/frontend/src/App.css rename to aiida_workgraph_web/frontend/src/App.css diff --git a/aiida_workgraph/web/frontend/src/App.js b/aiida_workgraph_web/frontend/src/App.js similarity index 100% rename from aiida_workgraph/web/frontend/src/App.js rename to aiida_workgraph_web/frontend/src/App.js diff --git a/aiida_workgraph/web/frontend/src/App.test.tsx b/aiida_workgraph_web/frontend/src/App.test.tsx similarity index 100% rename from aiida_workgraph/web/frontend/src/App.test.tsx rename to aiida_workgraph_web/frontend/src/App.test.tsx diff --git a/aiida_workgraph/web/frontend/src/components/AtomsItem.js b/aiida_workgraph_web/frontend/src/components/AtomsItem.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/AtomsItem.js rename to aiida_workgraph_web/frontend/src/components/AtomsItem.js diff --git a/aiida_workgraph/web/frontend/src/components/Data.js b/aiida_workgraph_web/frontend/src/components/Data.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/Data.js rename to aiida_workgraph_web/frontend/src/components/Data.js diff --git a/aiida_workgraph/web/frontend/src/components/DataNode.js b/aiida_workgraph_web/frontend/src/components/DataNode.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/DataNode.js rename to aiida_workgraph_web/frontend/src/components/DataNode.js diff --git a/aiida_workgraph/web/frontend/src/components/DataNodeItem.css b/aiida_workgraph_web/frontend/src/components/DataNodeItem.css similarity index 100% rename from aiida_workgraph/web/frontend/src/components/DataNodeItem.css rename to aiida_workgraph_web/frontend/src/components/DataNodeItem.css diff --git a/aiida_workgraph/web/frontend/src/components/DataNodeItem.tsx b/aiida_workgraph_web/frontend/src/components/DataNodeItem.tsx similarity index 100% rename from aiida_workgraph/web/frontend/src/components/DataNodeItem.tsx rename to aiida_workgraph_web/frontend/src/components/DataNodeItem.tsx diff --git a/aiida_workgraph/web/frontend/src/components/DataNodeTable.js b/aiida_workgraph_web/frontend/src/components/DataNodeTable.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/DataNodeTable.js rename to aiida_workgraph_web/frontend/src/components/DataNodeTable.js diff --git a/aiida_workgraph/web/frontend/src/components/Home.js b/aiida_workgraph_web/frontend/src/components/Home.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/Home.js rename to aiida_workgraph_web/frontend/src/components/Home.js diff --git a/aiida_workgraph/web/frontend/src/components/Layout.css b/aiida_workgraph_web/frontend/src/components/Layout.css similarity index 100% rename from aiida_workgraph/web/frontend/src/components/Layout.css rename to aiida_workgraph_web/frontend/src/components/Layout.css diff --git a/aiida_workgraph/web/frontend/src/components/Layout.js b/aiida_workgraph_web/frontend/src/components/Layout.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/Layout.js rename to aiida_workgraph_web/frontend/src/components/Layout.js diff --git a/aiida_workgraph/web/frontend/src/components/NodeDetails.js b/aiida_workgraph_web/frontend/src/components/NodeDetails.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/NodeDetails.js rename to aiida_workgraph_web/frontend/src/components/NodeDetails.js diff --git a/aiida_workgraph/web/frontend/src/components/Settings.js b/aiida_workgraph_web/frontend/src/components/Settings.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/Settings.js rename to aiida_workgraph_web/frontend/src/components/Settings.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphDetail.js b/aiida_workgraph_web/frontend/src/components/WorkGraphDetail.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphDetail.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphDetail.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphDuration.js b/aiida_workgraph_web/frontend/src/components/WorkGraphDuration.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphDuration.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphDuration.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphIndicator.js b/aiida_workgraph_web/frontend/src/components/WorkGraphIndicator.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphIndicator.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphIndicator.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphItem.tsx b/aiida_workgraph_web/frontend/src/components/WorkGraphItem.tsx similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphItem.tsx rename to aiida_workgraph_web/frontend/src/components/WorkGraphItem.tsx diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphItemStyles.ts b/aiida_workgraph_web/frontend/src/components/WorkGraphItemStyles.ts similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphItemStyles.ts rename to aiida_workgraph_web/frontend/src/components/WorkGraphItemStyles.ts diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphLog.js b/aiida_workgraph_web/frontend/src/components/WorkGraphLog.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphLog.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphLog.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphModals.js b/aiida_workgraph_web/frontend/src/components/WorkGraphModals.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphModals.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphModals.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphSummary.js b/aiida_workgraph_web/frontend/src/components/WorkGraphSummary.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphSummary.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphSummary.js diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphTable.css b/aiida_workgraph_web/frontend/src/components/WorkGraphTable.css similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphTable.css rename to aiida_workgraph_web/frontend/src/components/WorkGraphTable.css diff --git a/aiida_workgraph/web/frontend/src/components/WorkGraphTable.js b/aiida_workgraph_web/frontend/src/components/WorkGraphTable.js similarity index 100% rename from aiida_workgraph/web/frontend/src/components/WorkGraphTable.js rename to aiida_workgraph_web/frontend/src/components/WorkGraphTable.js diff --git a/aiida_workgraph/web/frontend/src/index.css b/aiida_workgraph_web/frontend/src/index.css similarity index 100% rename from aiida_workgraph/web/frontend/src/index.css rename to aiida_workgraph_web/frontend/src/index.css diff --git a/aiida_workgraph/web/frontend/src/index.tsx b/aiida_workgraph_web/frontend/src/index.tsx similarity index 100% rename from aiida_workgraph/web/frontend/src/index.tsx rename to aiida_workgraph_web/frontend/src/index.tsx diff --git a/aiida_workgraph/web/frontend/src/logo.svg b/aiida_workgraph_web/frontend/src/logo.svg similarity index 100% rename from aiida_workgraph/web/frontend/src/logo.svg rename to aiida_workgraph_web/frontend/src/logo.svg diff --git a/aiida_workgraph/web/frontend/src/react-app-env.d.ts b/aiida_workgraph_web/frontend/src/react-app-env.d.ts similarity index 100% rename from aiida_workgraph/web/frontend/src/react-app-env.d.ts rename to aiida_workgraph_web/frontend/src/react-app-env.d.ts diff --git a/aiida_workgraph/web/frontend/src/reportWebVitals.ts b/aiida_workgraph_web/frontend/src/reportWebVitals.ts similarity index 100% rename from aiida_workgraph/web/frontend/src/reportWebVitals.ts rename to aiida_workgraph_web/frontend/src/reportWebVitals.ts diff --git a/aiida_workgraph/web/frontend/src/rete.css b/aiida_workgraph_web/frontend/src/rete.css similarity index 100% rename from aiida_workgraph/web/frontend/src/rete.css rename to aiida_workgraph_web/frontend/src/rete.css diff --git a/aiida_workgraph/web/frontend/src/rete/AtomsItem.js b/aiida_workgraph_web/frontend/src/rete/AtomsItem.js similarity index 100% rename from aiida_workgraph/web/frontend/src/rete/AtomsItem.js rename to aiida_workgraph_web/frontend/src/rete/AtomsItem.js diff --git a/aiida_workgraph/web/frontend/src/rete/default.ts b/aiida_workgraph_web/frontend/src/rete/default.ts similarity index 100% rename from aiida_workgraph/web/frontend/src/rete/default.ts rename to aiida_workgraph_web/frontend/src/rete/default.ts diff --git a/aiida_workgraph/web/frontend/src/setupTests.ts b/aiida_workgraph_web/frontend/src/setupTests.ts similarity index 100% rename from aiida_workgraph/web/frontend/src/setupTests.ts rename to aiida_workgraph_web/frontend/src/setupTests.ts diff --git a/aiida_workgraph/web/frontend/tsconfig.json b/aiida_workgraph_web/frontend/tsconfig.json similarity index 100% rename from aiida_workgraph/web/frontend/tsconfig.json rename to aiida_workgraph_web/frontend/tsconfig.json diff --git a/aiida_workgraph/widget/.gitignore b/aiida_workgraph_widget/.gitignore similarity index 100% rename from aiida_workgraph/widget/.gitignore rename to aiida_workgraph_widget/.gitignore diff --git a/aiida_workgraph/widget/README.md b/aiida_workgraph_widget/README.md similarity index 100% rename from aiida_workgraph/widget/README.md rename to aiida_workgraph_widget/README.md diff --git a/aiida_workgraph/widget/__init__.py b/aiida_workgraph_widget/__init__.py similarity index 100% rename from aiida_workgraph/widget/__init__.py rename to aiida_workgraph_widget/__init__.py diff --git a/aiida_workgraph/widget/js/default_rete.ts b/aiida_workgraph_widget/js/default_rete.ts similarity index 100% rename from aiida_workgraph/widget/js/default_rete.ts rename to aiida_workgraph_widget/js/default_rete.ts diff --git a/aiida_workgraph/widget/js/widget.css b/aiida_workgraph_widget/js/widget.css similarity index 100% rename from aiida_workgraph/widget/js/widget.css rename to aiida_workgraph_widget/js/widget.css diff --git a/aiida_workgraph/widget/js/widget.tsx b/aiida_workgraph_widget/js/widget.tsx similarity index 100% rename from aiida_workgraph/widget/js/widget.tsx rename to aiida_workgraph_widget/js/widget.tsx diff --git a/aiida_workgraph/widget/package-lock.json b/aiida_workgraph_widget/package-lock.json similarity index 100% rename from aiida_workgraph/widget/package-lock.json rename to aiida_workgraph_widget/package-lock.json diff --git a/aiida_workgraph/widget/package.json b/aiida_workgraph_widget/package.json similarity index 100% rename from aiida_workgraph/widget/package.json rename to aiida_workgraph_widget/package.json diff --git a/aiida_workgraph/widget/pyproject.toml b/aiida_workgraph_widget/pyproject.toml similarity index 100% rename from aiida_workgraph/widget/pyproject.toml rename to aiida_workgraph_widget/pyproject.toml diff --git a/aiida_workgraph/widget/src/widget/__init__.py b/aiida_workgraph_widget/src/widget/__init__.py similarity index 100% rename from aiida_workgraph/widget/src/widget/__init__.py rename to aiida_workgraph_widget/src/widget/__init__.py diff --git a/aiida_workgraph/widget/src/widget/html_template.py b/aiida_workgraph_widget/src/widget/html_template.py similarity index 100% rename from aiida_workgraph/widget/src/widget/html_template.py rename to aiida_workgraph_widget/src/widget/html_template.py diff --git a/aiida_workgraph/widget/src/widget/utils.py b/aiida_workgraph_widget/src/widget/utils.py similarity index 100% rename from aiida_workgraph/widget/src/widget/utils.py rename to aiida_workgraph_widget/src/widget/utils.py diff --git a/aiida_workgraph/widget/tsconfig.json b/aiida_workgraph_widget/tsconfig.json similarity index 100% rename from aiida_workgraph/widget/tsconfig.json rename to aiida_workgraph_widget/tsconfig.json diff --git a/docs/source/development/test.rst b/docs/source/development/test.rst index 593a860b..df3071e6 100644 --- a/docs/source/development/test.rst +++ b/docs/source/development/test.rst @@ -11,8 +11,8 @@ To contribute to this repository, please enable pre-commit to ensure that the co Widget ---------------- -See the `README.md `_. +See the `README.md `_. Web app ---------------- -See the `README.md `_. +See the `README.md `_. diff --git a/docs/source/installation.rst b/docs/source/installation.rst index b4944b78..f06b5d91 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -46,11 +46,11 @@ To install the jupyter widget support you need to in addition build the JavaScri $ cd aiida-workgraph $ pip install -e . $ # build widget - $ cd aiida_workgraph/widget/ + $ cd aiida_workgraph_widget/ $ npm install $ npm run build $ # build web frontend - $ cd ../../aiida_workgraph/web/frontend/ + $ cd ../../aiida_workgraph_web/frontend/ $ npm install $ npm run build diff --git a/pyproject.toml b/pyproject.toml index 289db4b6..92319618 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -148,8 +148,8 @@ workgraph = "aiida_workgraph.cli.cmd_workgraph:workgraph" exclude = [ "docs/", "tests/", - "aiida_workgraph/web/frontend/node_modules/", - "aiida_workgraph/widget/node_modules/", + "aiida_workgraph_web/frontend/node_modules/", + "aiida_workgraph_widget/node_modules/", ] diff --git a/tests/web/backend/conftest.py b/tests/web/backend/conftest.py index fe7f7335..7385718f 100644 --- a/tests/web/backend/conftest.py +++ b/tests/web/backend/conftest.py @@ -17,6 +17,6 @@ def set_backend_server_settings(aiida_profile): @pytest.fixture(scope="module") def client(set_backend_server_settings): - from aiida_workgraph.web.backend.app.api import app + from aiida_workgraph_web.backend.app.api import app return TestClient(app) diff --git a/tests/web/frontend/conftest.py b/tests/web/frontend/conftest.py index 625fbd3d..d6fc1eef 100644 --- a/tests/web/frontend/conftest.py +++ b/tests/web/frontend/conftest.py @@ -93,7 +93,7 @@ def ran_wg_calcfunction( @pytest.fixture(scope="module") def uvicorn_configuration(): return { - "app": "aiida_workgraph.web.backend.app.api:app", + "app": "aiida_workgraph_web.backend.app.api:app", "host": "0.0.0.0", "port": 8000, "log_level": "info",