Merge branch 'dev'

Removed odp-core submodule: moved up to odp-build.

.github/workflows/main.yml

@@ -5,28 +5,53 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out odp-server
+        uses: actions/checkout@v4
+        with:
+          path: odp-server
+
+      - name: Check out odp-core
+        uses: actions/checkout@v4
         with:
-          submodules: recursive
-      - uses: actions/setup-python@v2
+          repository: SAEON/odp-core
+          path: odp-core
+          ref: dev
+
+      - name: Check out odp-ui
+        uses: actions/checkout@v4
+        with:
+          repository: SAEON/odp-ui
+          path: odp-ui
+          ref: dev
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
           python-version: '3.10'
+
       - name: Install dependencies
+        working-directory: odp-server
         run: |
           python -m pip install --upgrade pip pip-tools
           pip-sync
+
       - name: Set up testing environment
-        working-directory: ./test
+        working-directory: odp-server/test
         shell: bash
         run: |
           cp .env.test .env
           docker-compose up -d
           sleep 30s
+
       - name: Run the tests
-        working-directory: ./test
+        working-directory: odp-server/test
         run: |
           coverage run -m pytest
           coverage xml
+
       - name: Upload coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
+        with:
+          directory: odp-server/test

requirements.in

@@ -1,4 +1,5 @@
--e file:odp-core
+-e file:../odp-core
+-e file:../odp-ui
 
 sqlalchemy
 psycopg2

requirements.txt

@@ -4,7 +4,9 @@
 #
 #    pip-compile
 #
--e file:odp-core
+-e file:../odp-core
+    # via -r requirements.in
+-e file:../odp-ui
     # via -r requirements.in
 alembic==1.12.0
     # via -r requirements.in
@@ -23,6 +25,7 @@ authlib==1.2.1
     # via
     #   -r requirements.in
     #   odp
+    #   odp-ui
 blinker==1.6.2
     # via
     #   flask
@@ -67,9 +70,9 @@ flask==2.3.3
     #   -r requirements.in
     #   flask-login
     #   flask-mail
-    #   odp
+    #   odp-ui
 flask-login==0.6.2
-    # via odp
+    # via odp-ui
 flask-mail==0.9.1
     # via -r requirements.in
 greenlet==2.0.2
@@ -143,6 +146,7 @@ redis==5.0.0
     # via
     #   -r requirements.in
     #   odp
+    #   odp-ui
 requests==2.31.0
     # via
     #   -r requirements.in
@@ -190,4 +194,4 @@ werkzeug==2.3.7
 wtforms==3.0.1
     # via
     #   -r requirements.in
-    #   odp
+    #   odp-ui

test/.coveragerc

@@ -3,12 +3,13 @@ source =
     # odp-core
     odp.config
     odp.const
-    odp.logfile
-    odp.schema
-    odp.version
     odp.lib.cache
+    odp.lib.client
     odp.lib.datacite
     odp.lib.hydra
+    odp.logfile
+    odp.schema
+    odp.version
 
     # odp-server
     odp.api