Merge pull request #202 from iiif-prezi/upgrade_libraries

Updating to supported versions of python

.github/workflows/PyPi.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -25,6 +25,6 @@ jobs:
       run: python -m build --sdist --wheel --outdir dist/
 
     - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.8
+      uses: pypa/gh-action-pypi-publish@v1.12.2
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}  

.github/workflows/TestPyPi.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -26,7 +26,7 @@ jobs:
 
 
     - name: Publish distribution 📦 to Test PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.8
+      uses: pypa/gh-action-pypi-publish@v1.12.2
       with:
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/

.github/workflows/ci.yml

@@ -12,17 +12,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
     name: Python ${{ matrix.python-version }} sample
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-u22

.github/workflows/docs.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip-docs
           key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}
@@ -38,7 +38,7 @@ jobs:
       # when building on push to main, publish the compiled documentation
       - name: Deploy built docs to github pages
         if: ${{ github.event_name == 'push' }}
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./site

.github/workflows/recipes.yml

@@ -9,14 +9,14 @@ jobs:
   test-recipes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
           architecture: x64
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ env.pythonLocation }}

docs/recipes/scripts/0003-mvm-video-method1.py

@@ -15,7 +15,6 @@
 
 hwd = {"height": 360, "width": 480, "duration": 572.034}
 anno_body.set_hwd(**hwd)
-hwd["width"] = 640
 canvas.set_hwd(**hwd)
 
 anno_page.add_item(anno)

docs/recipes/scripts/0008-rights-method1.py

@@ -7,7 +7,7 @@
                     summary="<p>Picture taken by the <a href=\"https://github.com/glenrobson\">IIIF Technical Coordinator</a></p>",
                     rights="http://creativecommons.org/licenses/by-sa/3.0/",
                     requiredStatement=KeyValueString(label="Attribution",
-                                                     value="<span>Glen Robson, IIIF Technical Coordinator. <a href=\"https://creativecommons.org/licenses/by-sa/3.0\">CC BY-SA 3.0</a> <a href=\"https://creativecommons.org/licenses/by-sa/3.0\" title\"CC BY-SA 3.0\"><img src=\"https://licensebuttons.net/l/by-sa/3.0/88x31.png\"/></a></span>")
+                                                     value="<span>Glen Robson, IIIF Technical Coordinator. <a href=\"https://creativecommons.org/licenses/by-sa/3.0\">CC BY-SA 3.0</a> <a href=\"https://creativecommons.org/licenses/by-sa/3.0\" title=\"CC BY-SA 3.0\"><img src=\"https://licensebuttons.net/l/by-sa/3.0/88x31.png\"/></a></span>")
                     )
 
 canvas = manifest.make_canvas_from_iiif(url="https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen",

docs/recipes/scripts/0017-transcription-av-method1.py

@@ -24,7 +24,7 @@
 rendering = ExternalItem(id="https://fixtures.iiif.io/video/indiana/volleyball/volleyball.txt",
                          type="Text",
                          label="Transcript",
-                         format="text/txt")
+                         format="text/plain")
 
 canvas.rendering = [rendering]
 

setup.py

@@ -13,28 +13,28 @@
     VERSION = "0.0.0.dev0"
 
 REQUIREMENTS = [
-    "pydantic >= 1.9.2, <2.0.0",
+    "pydantic >= 1.9.2, <2.0.0", # potentially update to 3.0.0 https://github.com/pydantic/pydantic/releases
     "requests >=2.28.0, <3.0.0",
-    "Pillow >=9.1.1, <11.0.0"
+    "Pillow >=9.1.1, <=12.0.0"
 ]
 
 DOCS_REQUIREMENTS = [
     "mkdocs >=1.4.0, <2.0.0",
-    "mkdocs-material >=8.0.0, <9.0.0",
-    "mkdocstrings-python >=0.7.0, <1.0.0",
-    "griffe >=0.25.2, <1.0.0",
+    "mkdocs-material >=8.0.0, <10.0.0",
+    "mkdocstrings-python >=0.7.0, <2.0.0",
+    "griffe >=0.25.2, <2.0.0",
     "mkdocs-awesome-pages-plugin >=2.8.0, <3.0.0"
 ]
 
 DEV_REQUIREMENTS = [
-    "autopep8 >=1.6.0, <2.0.0",
+    "autopep8 >=1.6.0, <3.0.0",
     "isort >=5.10.1, <6.0.0",
-    "flake8 >=4.0.1, <5.0.0",
+    "flake8 >=4.0.1, <6.0.0",
     "flake8-docstrings >=1.6.0, <2.0.0",
-    "flake8-isort >=4.1.1, <5.0.0",
-    "tox >=3.25.0, <4.0.0",
-    "Pillow >=9.1.1, <11.0.0",
-    "deepdiff >=6.2.2, <7.0.0",
+    "flake8-isort >=4.1.1, <7.0.0",
+    "tox >=3.25.0, <5.0.0",
+    "Pillow >=9.1.1, <=12.0.0",  
+    "deepdiff >=6.2.2, <9.0.0",
     "datamodel-code-generator >=0.17.1, <1.0.0"
 ]
 
@@ -56,11 +56,11 @@
                  "Operating System :: OS Independent",  # is this true? know Linux & OS X ok
                  "Programming Language :: Python",
                  "Programming Language :: Python :: 3",
-                 "Programming Language :: Python :: 3.7",
-                 "Programming Language :: Python :: 3.8",
                  "Programming Language :: Python :: 3.9",
                  "Programming Language :: Python :: 3.10",
                  "Programming Language :: Python :: 3.11",
+                 "Programming Language :: Python :: 3.12",
+                 "Programming Language :: Python :: 3.13",
                  "Topic :: Internet :: WWW/HTTP",
                  "Topic :: Multimedia :: Graphics :: Graphics Conversion",
                  "Topic :: Software Development :: Libraries :: Python Modules",

tox.ini

@@ -1,13 +1,13 @@
 [tox]
-envlist = py37, py38, py39, py310, py311, linting
+envlist = py39, py310, py311, linting, py312, py313
 
 [gh-actions]
 python =
-    3.7: py37
-    3.8: py38
     3.9: py39, linting
     3.10: py310
     3.11: py311
+    3.12: py312
+    3.13: py313
 
 [testenv]
 commands =
@@ -19,4 +19,4 @@ extras = dev
 commands =
   isort .
   autopep8 --in-place --recursive --exclude skeleton.py --ignore E501 .
-  flake8
+  flake8