diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml deleted file mode 100644 index 285167be..00000000 --- a/.github/workflows/gh-pages.yml +++ /dev/null @@ -1,146 +0,0 @@ -# From: https://github.com/rkdarst/sphinx-actions-test/blob/master/.github/workflows/sphinx-build.yml - -name: Build and deploy sphinx -on: [push] - -env: - DEFAULT_BRANCH: "master" - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: write - pages: write - id-token: write - -# Allow one concurrent deployment -concurrency: - group: "pages" - cancel-in-progress: true - -jobs: - build-and-deploy-docs: - name: Build docs, deploy to gh-pages - runs-on: ubuntu-latest - steps: - # https://github.com/marketplace/actions/checkout - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - lfs: true - # https://github.com/marketplace/actions/setup-python - # ^-- This gives info on matrix testing. - - name: Install Python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - # https://docs.github.com/en/actions/guides/building-and-testing-python#installing-dependencies - # ^-- This gives info on installing dependencies with pip - - name: Install Dependencies for Django - run: | - python -m pip install --upgrade pip - pip install wheel # Install wheel for packages using legacy install methods - pip install -e .[dev] - - name: Debugging information - run: | - echo "github.ref:" ${{github.ref}} - echo "github.event_name:" ${{github.event_name}} - echo "github.head_ref:" ${{github.head_ref}} - echo "github.base_ref:" ${{github.base_ref}} - set -x - git rev-parse --abbrev-ref HEAD - git branch - git branch -a - git remote -v - python -V - pip list --not-required - pip list - - # Build - - uses: ammaraskar/sphinx-problem-matcher@master - - name: Build Sphinx docs - run: | - cd docs - make html - sed -i 's/url_root="#"/url_root=""/' _build/html/index.html || true - - - # The following supports building all branches and combining on - # gh-pages - - # Clone and set up the old gh-pages branch - - name: Clone old gh-pages - if: ${{ github.event_name == 'push' }} - run: | - set -x - git fetch - ( git branch gh-pages remotes/origin/gh-pages && git clone . --branch=gh-pages _gh-pages/ ) || mkdir _gh-pages - rm -rf _gh-pages/.git/ - mkdir -p _gh-pages/branch/ - # If a push and default branch, copy build to _gh-pages/ as the "main" - # deployment. - - name: Copy new build (default branch) - if: | - contains(github.event_name, 'push') && - contains(github.ref, env.DEFAULT_BRANCH) - run: | - set -x - # Delete everything under _gh-pages/ that is from the - # primary branch deployment. Eicludes the other branches - # _gh-pages/branch-* paths, and not including - # _gh-pages itself. - find _gh-pages/ -mindepth 1 ! -path '_gh-pages/branch*' -delete - rsync -a docs/_build/html/ _gh-pages/ - # If a push and not on default branch, then copy the build to - # _gh-pages/branch/$brname (transforming '/' into '--') - - name: Copy new build (branch) - if: | - contains(github.event_name, 'push') && - !contains(github.ref, env.DEFAULT_BRANCH) - run: | - set -x - #brname=$(git rev-parse --abbrev-ref HEAD) - brname="${{github.ref}}" - brname="${brname##refs/heads/}" - brdir=${brname//\//--} # replace '/' with '--' - rm -rf _gh-pages/branch/${brdir} - rsync -a docs/_build/html/ _gh-pages/branch/${brdir} - # Go through each branch in _gh-pages/branch/, if it's not a - # ref, then delete it. - - name: Delete old feature branches - if: ${{ github.event_name == 'push' }} - run: | - set -x - for brdir in `ls _gh-pages/branch/` ; do - brname=${brdir//--/\/} # replace '--' with '/' - if ! git show-ref remotes/origin/$brname ; then - echo "Removing $brdir" - rm -r _gh-pages/branch/$brdir/ - fi - done - - # Add the .nojekyll file - - name: nojekyll - if: ${{ github.event_name == 'push' }} - run: | - touch _gh-pages/.nojekyll - - # Deploy to branch - # https://github.com/peaceiris/actions-gh-pages - - name: Deploy - uses: peaceiris/actions-gh-pages@v4 - if: ${{ github.event_name == 'push' }} - #if: ${{ success() && github.event_name == 'push' && github.ref == 'refs/heads/$defaultBranch' }} - with: - publish_branch: gh-pages - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: _gh-pages/ - force_orphan: true - - # Upload artefact & deploy to pages - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: '_gh-pages' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/dev/requirements.in b/dev/requirements.in index bbc55e07..8e9e3a40 100644 --- a/dev/requirements.in +++ b/dev/requirements.in @@ -1,4 +1,4 @@ -django > 5, < 5.2 +django >= 4.2, < 5.2 ../.[dev] django-braces django-modeltranslation diff --git a/dev/requirements.txt b/dev/requirements.txt index 21ec4de0..8243b0ce 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,28 +1,29 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile +# pip-compile requirements.in # alabaster==1.0.0 # via sphinx -asgiref==3.9.1 +asgiref==3.11.1 # via django -babel==2.17.0 +babel==2.18.0 # via sphinx -blessed==1.21.0 +blessed==1.34.0 # via curtsies -bpython==0.25 +bpython==0.26 # via cdh-django-core -build==1.2.2.post1 +build==1.4.2 # via pip-tools -certifi==2025.7.14 +../.[all,core,dev,docs,federated-auth,files,mail,recommended,rest,vue] +certifi==2026.2.25 # via requests -cffi==1.17.1 +cffi==2.0.0 # via cryptography -charset-normalizer==3.4.2 +charset-normalizer==3.4.6 # via requests -click==8.2.1 +click==8.3.1 # via pip-tools closure==20191111 # via @@ -36,7 +37,7 @@ cryptography==43.0.3 # pysaml2 curtsies==0.4.3 # via bpython -cwcwidth==0.1.10 +cwcwidth==0.1.12 # via # bpython # curtsies @@ -44,9 +45,9 @@ defusedxml==0.7.1 # via # djangosaml2 # pysaml2 -deprecated==1.2.18 +deprecated==1.3.1 # via cdh-django-core -django==5.1.11 +django==5.1.15 # via # -r requirements.in # cdh-django-core @@ -68,7 +69,7 @@ django-csp==4.0 # via # -r requirements.in # cdh-django-core -django-debug-toolbar==5.2.0 +django-debug-toolbar==6.2.0 # via # -r requirements.in # cdh-django-core @@ -82,7 +83,7 @@ django-impersonate==1.9.5 # via # -r requirements.in # cdh-django-core -django-modeltranslation==0.19.16 +django-modeltranslation==0.20.2 # via # -r requirements.in # cdh-django-core @@ -90,25 +91,25 @@ django-simple-menu==2.1.4 # via # -r requirements.in # cdh-django-core -djangorestframework==3.16.0 +djangorestframework==3.17.1 # via # -r requirements.in # cdh-django-core -djangosaml2==1.11.1 +djangosaml2==1.12.0 # via # -r requirements.in # cdh-django-core -docutils==0.21.2 +docutils==0.22.4 # via sphinx elementpath==4.8.0 # via xmlschema -faker==37.4.2 +faker==40.11.1 # via cdh-django-core -greenlet==3.2.3 +greenlet==3.3.2 # via bpython -idna==3.10 +idna==3.11 # via requests -imagesize==1.4.1 +imagesize==2.0.0 # via sphinx jinja2==3.1.6 # via sphinx @@ -116,18 +117,19 @@ lesscpy==0.15.1 # via # -r requirements.in # cdh-django-core -markupsafe==3.0.2 +markupsafe==3.0.3 # via jinja2 -mysqlclient==2.2.7 +mysqlclient==2.2.8 # via -r requirements.in -packaging==25.0 +packaging==26.0 # via # build # django-csp # sphinx -pbr==6.1.1 + # wheel +pbr==7.0.3 # via sphinxcontrib-apidoc -pip-tools==7.4.1 +pip-tools==7.5.3 # via # -r requirements.in # cdh-django-core @@ -137,13 +139,13 @@ pprintpp==0.4.0 # via sphinxcontrib-django pscript==0.7.7 # via vbuild -pycparser==2.22 +pycparser==3.0 # via cffi pygments==2.19.2 # via # bpython # sphinx -pyjwt==2.10.1 +pyjwt==2.12.1 # via # -r requirements.in # cdh-django-core @@ -153,7 +155,7 @@ pyproject-hooks==1.2.0 # via # build # pip-tools -pysaml2==7.5.2 +pysaml2==7.5.4 # via djangosaml2 pyscss==1.4.0 # via @@ -165,18 +167,16 @@ python-magic==0.4.27 # via # -r requirements.in # cdh-django-core -pytz==2025.2 - # via pysaml2 pyxdg==0.28 # via bpython -requests==2.32.4 +requests==2.33.0 # via # -r requirements.in # bpython # cdh-django-core # pysaml2 # sphinx -roman-numerals-py==3.1.0 +roman-numerals==4.1.0 # via sphinx six==1.17.0 # via @@ -184,7 +184,7 @@ six==1.17.0 # python-dateutil snowballstemmer==3.0.1 # via sphinx -sphinx==8.2.3 +sphinx==9.1.0 # via # cdh-django-core # sphinxcontrib-apidoc @@ -208,13 +208,13 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.3 +sqlparse==0.5.5 # via # django # django-debug-toolbar -tzdata==2025.2 - # via faker -urllib3==2.5.0 +typing-extensions==4.15.0 + # via django-modeltranslation +urllib3==2.6.3 # via requests uu-sphinx-theme @ git+https://github.com/CentreForDigitalHumanities/sphinx-theme.git@main # via cdh-django-core @@ -222,11 +222,11 @@ vbuild==0.8.2 # via # -r requirements.in # cdh-django-core -wcwidth==0.2.13 +wcwidth==0.6.0 # via blessed -wheel==0.45.1 +wheel==0.46.3 # via pip-tools -wrapt==1.17.2 +wrapt==2.1.2 # via deprecated xmlschema==2.5.1 # via pysaml2 diff --git a/pyproject.toml b/pyproject.toml index 5bce3f0d..32f6ade8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ include-package-data = true [project] name = "cdh-django-core" description = "A Django apps library for CDH projects" -version = "3.2.0" +version = "3.3.0" readme = "README.md" authors = [ {name = "DH-IT Portal Development", email = "portaldev.gw@uu.nl"},