Merge branch 'develop'

.github/workflows/publish-to-pypi.yaml

@@ -0,0 +1,29 @@
+name: Publish
+on:
+  release:
+    types:
+       - published
+jobs:
+  PyPI:
+    name: publish release to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    env:
+      SDIST: python-icat-${{ github.event.release.tag_name }}.tar.gz
+    steps:
+      - name: Fetch assets
+        uses: cb80/dlassets@latest
+        with:
+          tag: ${{ github.event.release.tag_name }}
+          to: assets
+      - name: Check assets
+        run: |
+          ls -la assets
+      - name: Copy distfile to dist directory
+        run: |
+          mkdir -p dist
+          cp -p assets/$SDIST dist
+      - name: Upload distfile to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/rst-lint.yaml

@@ -0,0 +1,30 @@
+name: Check ReST input files
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+jobs:
+  doc8:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        run: |
+          pip install setuptools packaging git-props suds
+      - name: Run conf.py
+        run: |
+          python setup.py build
+          python doc/src/conf.py
+      - name: doc8-check
+        uses: deep-entertainment/doc8-action@v4
+        with:
+          scanPaths: "doc/src"

.gitignore

@@ -1,16 +1,18 @@
 __pycache__/
+/.local/
 /MANIFEST
 /_meta.py
 /build/
 /dist/
-/icat/__init__.py
 /tests/data/example_data.yaml
 /tests/data/icat.cfg
+/tests/data/icatdata-*.xsd
 /tests/data/icatdump-*.xml
 /tests/data/icatdump-*.yaml
 /tests/data/ingest-*.xml
 /tests/data/ingest-*.xsd
 /tests/data/ingest.xslt
 /tests/data/metadata-*-inl.xml
 /tests/data/metadata-*-sep.xml
+/tests/data/metadata-sample.xml
 /tests/scripts/

.readthedocs.yaml

@@ -11,7 +11,7 @@ build:
     post_checkout:
       - git fetch --unshallow
     post_install:
-      - python setup.py meta
+      - python setup.py build
 
 sphinx:
   configuration: doc/src/conf.py

.rtd-require

@@ -1,9 +1,8 @@
 PyYAML
+git-props
 lxml
 packaging
 setuptools
-setuptools_scm
 suds
-jinja2<3.1
-sphinx>=2,<3
-sphinx-rtd-theme>=0.5,<1
+sphinx-copybutton
+sphinx_rtd_theme