Reorganise project layout

.github/workflows/pytest-builds.yml

@@ -35,12 +35,12 @@ jobs:
 
     - name: Run pytest
       run: |
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom pylibjpeg
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
   osx:
     runs-on: macos-latest
@@ -69,12 +69,12 @@ jobs:
 
     - name: Run pytest
       run: |
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom pylibjpeg
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
   ubuntu:
     runs-on: ubuntu-latest
@@ -103,19 +103,19 @@ jobs:
 
     - name: Run pytest
       run: |
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
     - name: Install pydicom release and rerun pytest
       run: |
         pip install pydicom pylibjpeg
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
     - name: Switch to pydicom dev and rerun pytest (3.10+)
       if: ${{ contains('3.10 3.11 3.12', matrix.python-version) }}
       run: |
         pip uninstall -y pydicom
         pip install git+https://github.com/pydicom/pydicom
-        pytest --cov openjpeg --ignore=openjpeg/src/openjpeg
+        pytest --cov openjpeg
 
     - name: Send coverage results
       if: ${{ success() && matrix.coverage == 'coverage' }}

.gitmodules

@@ -1 +1,4 @@
 
+[submodule "lib/openjpeg"]
+	path = lib/openjpeg
+	url = https://github.com/uclouvain/openjpeg

openjpeg/tests/README.md

@@ -0,0 +1,14 @@
+Unit tests for pylibjpeg-openjpeg
+
+Dependencies
+------------
+
+Required
+........
+[pytest](https://docs.pytest.org/)
+[pylibjpeg-data](https://github.com/pydicom/pylibjpeg-data)
+
+Optional
+........
+[pylibjpeg](https://github.com/pydicom/pylibjpeg)
+[pydicom](https://github.com/pydicom/pydicom)

openjpeg/tests/__init__.py

@@ -0,0 +1,10 @@
+import sys
+
+# Add the testing data to openjpeg (if available)
+try:
+    import ljdata as _data
+    globals()['data'] = _data
+    # Add to cache - needed for pytest
+    sys.modules['openjpeg.data'] = _data
+except ImportError:
+    pass