From 2b43f3b68b909ae5918a0c25197eee587143a34c Mon Sep 17 00:00:00 2001 From: Sidney Richards Date: Thu, 19 Dec 2024 15:21:35 +0100 Subject: [PATCH 1/5] Run docs build in CI --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5036b9a..9d0be7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,6 +95,7 @@ jobs: main-branch: 'master' python-version: '3.11' docker-image-name: ${{ needs.store-reusable-workflow-vars.outputs.image-name }} + run-docs: true open-api-publish: uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v1 From d5d0f83b2802bbf8007c7c1eefe6b34ed09dacfe Mon Sep 17 00:00:00 2001 From: Sidney Richards Date: Thu, 19 Dec 2024 15:27:20 +0100 Subject: [PATCH 2/5] Include sphinx packages in CI deps --- docs/Makefile | 20 ++++++++++ docs/check_sphinx.py | 17 ++++++++ docs/conf.py | 90 +++++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 2 + docs/make.bat | 35 +++++++++++++++++ requirements/base.txt | 10 ++--- requirements/ci.in | 4 ++ requirements/ci.txt | 44 ++++++++++++++++++--- requirements/dev.txt | 6 +-- 9 files changed, 211 insertions(+), 17 deletions(-) create mode 100644 docs/Makefile create mode 100644 docs/check_sphinx.py create mode 100644 docs/conf.py create mode 100644 docs/index.rst create mode 100644 docs/make.bat diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..d4bb2cb --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/check_sphinx.py b/docs/check_sphinx.py new file mode 100644 index 0000000..cc1003a --- /dev/null +++ b/docs/check_sphinx.py @@ -0,0 +1,17 @@ +import subprocess + + +def test_linkcheck(tmpdir): + doctrees = tmpdir.join("doctrees") + htmldir = tmpdir.join("html") + subprocess.check_call( + ["sphinx-build", "-W", "-blinkcheck", "-d", str(doctrees), ".", str(htmldir)], + ) + + +def test_build_docs(tmpdir): + doctrees = tmpdir.join("doctrees") + htmldir = tmpdir.join("html") + subprocess.check_call( + ["sphinx-build", "-W", "-bhtml", "-d", str(doctrees), ".", str(htmldir)], + ) diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..fc2a50e --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,90 @@ +# Configuration file for the Sphinx documentation builder. +# +# This file only contains a selection of the most common options. For a full +# list see the documentation: +# https://www.sphinx-doc.org/en/master/usage/configuration.html + +# -- Path setup -------------------------------------------------------------- +import os +import sys + +sys.path.insert(0, os.path.abspath("../src")) + +import objects # noqa isort:skip + +# from objects.setup import setup_env # noqa isort:skip + +# TODO: This needs to be enabled when we want to use autodoc to grab +# documentation from classes and functions. However, enabling django.setup() +# causes RTD to fail because GDAL is not present in the RTD environment. +# See: https://github.com/readthedocs/readthedocs-docker-images/issues/114#issuecomment-570566599 +# +# setup_env() +# django.setup() + +# -- Project information ----------------------------------------------------- + +project = "Objects and Objecttypes API" +copyright = "2020, Maykin Media" +author = objects.__author__ + +# The full version, including alpha/beta/rc tags +release = objects.__version__ + + +# -- General configuration --------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + "sphinx.ext.todo", + "sphinx_tabs.tabs", + "recommonmark", + # "sphinx_markdown_tables", +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ["_templates"] + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +language = "en" + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This pattern also affects html_static_path and html_extra_path. +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] + +source_suffix = [".rst", ".md"] + +# -- Options for HTML output ------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +html_logo = "logo.png" +html_theme = "sphinx_rtd_theme" + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ["_static"] +html_css_files = [ + "theme_overrides.css", # override wide tables with word wrap +] + +todo_include_todos = True + +linkcheck_timeout = 10 +linkcheck_ignore = [ + r"https?://.*\.gemeente.nl", + r"http://localhost:\d+/", + r"https://.*sentry.*", + "https://github.com/maykinmedia/objects-api-performance", + "https://objects.municipality.nl/admin/", + "https://sparxsystems.com/products/ea/trial/request.html", # this raises 403 for crawlers probably? +] diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..9d89971 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,2 @@ +Documentation +============= diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..2119f51 --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=. +set BUILDDIR=_build + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/requirements/base.txt b/requirements/base.txt index 90ac5d5..2fd5cc1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# 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 --no-emit-index-url requirements/base.in @@ -195,9 +195,7 @@ drf-nested-routers==0.94.1 # -r requirements/base.in # commonground-api-common drf-spectacular[sidecar]==0.27.2 - # via - # drf-spectacular - # open-api-framework + # via open-api-framework drf-spectacular-sidecar==2024.7.1 # via drf-spectacular drf-yasg==1.21.7 @@ -277,9 +275,7 @@ pydantic==2.9.2 pydantic-core==2.23.4 # via pydantic pydantic-settings[yaml]==2.6.1 - # via - # django-setup-configuration - # pydantic-settings + # via django-setup-configuration pyjwt==2.7.0 # via # commonground-api-common diff --git a/requirements/ci.in b/requirements/ci.in index ec8ac8a..9ae16b9 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -1,2 +1,6 @@ codecov coverage + +# Documentation +sphinx +sphinx_rtd_theme diff --git a/requirements/ci.txt b/requirements/ci.txt index 3ca4980..46f3d40 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,9 +1,11 @@ # -# 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 --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/ci.in requirements/test-tools.in # +alabaster==1.0.0 + # via sphinx amqp==5.1.1 # via # -r requirements/base.txt @@ -33,6 +35,8 @@ attrs==23.1.0 # -r requirements/base.txt # glom # jsonschema +babel==2.16.0 + # via sphinx beautifulsoup4==4.12.2 # via webtest billiard==4.2.0 @@ -262,7 +266,6 @@ django-solo==2.0.0 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 # via # -r requirements/base.txt - # django-two-factor-auth # maykin-2fa django-webtest==1.9.10 # via -r requirements/test-tools.in @@ -290,6 +293,10 @@ djangorestframework-inclusions==1.2.0 # via # -r requirements/base.txt # open-api-framework +docutils==0.21.2 + # via + # sphinx + # sphinx-rtd-theme drf-nested-routers==0.94.1 # via # -r requirements/base.txt @@ -297,7 +304,6 @@ drf-nested-routers==0.94.1 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/base.txt - # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via @@ -348,6 +354,8 @@ idna==3.7 # -r requirements/base.txt # requests # yarl +imagesize==1.4.1 + # via sphinx inflection==0.5.1 # via # -r requirements/base.txt @@ -371,6 +379,7 @@ jinja2==3.1.4 # via # -r requirements/base.txt # coreschema + # sphinx josepy==1.13.0 # via # -r requirements/base.txt @@ -402,7 +411,6 @@ mozilla-django-oidc==4.0.0 mozilla-django-oidc-db[django-setup-configuration]==0.21.1 # via # -r requirements/base.txt - # mozilla-django-oidc-db # open-api-framework multidict==6.0.5 # via yarl @@ -427,6 +435,7 @@ packaging==23.1 # -r requirements/base.txt # black # drf-yasg + # sphinx pathspec==0.12.1 # via black phonenumberslite==8.13.30 @@ -466,9 +475,10 @@ pydantic-settings[yaml]==2.6.1 # via # -r requirements/base.txt # django-setup-configuration - # pydantic-settings pyflakes==3.2.0 # via flake8 +pygments==2.18.0 + # via sphinx pyjwt==2.7.0 # via # -r requirements/base.txt @@ -534,6 +544,7 @@ requests==2.32.3 # open-api-framework # requests-mock # sharing-configs + # sphinx # zgw-consumers requests-mock==1.12.1 # via @@ -556,8 +567,31 @@ six==1.16.0 # orderedmultidict # python-dateutil # qrcode +snowballstemmer==2.2.0 + # via sphinx soupsieve==2.4.1 # via beautifulsoup4 +sphinx==8.1.3 + # via + # -r requirements/ci.in + # sphinx-rtd-theme + # sphinxcontrib-jquery +sphinx-rtd-theme==3.0.2 + # via -r requirements/ci.in +sphinxcontrib-applehelp==2.0.0 + # via sphinx +sphinxcontrib-devhelp==2.0.0 + # via sphinx +sphinxcontrib-htmlhelp==2.1.0 + # via sphinx +sphinxcontrib-jquery==4.1 + # via sphinx-rtd-theme +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==2.0.0 + # via sphinx +sphinxcontrib-serializinghtml==2.0.0 + # via sphinx sqlparse==0.5.0 # via # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 7a4b1c3..869eb98 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# 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 --no-emit-index-url --output-file=requirements/dev.txt requirements/base.txt requirements/dev.in requirements/test-tools.in @@ -273,7 +273,6 @@ django-solo==2.0.0 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 # via # -r requirements/base.txt - # django-two-factor-auth # maykin-2fa django-webtest==1.9.10 # via -r requirements/test-tools.in @@ -312,7 +311,6 @@ drf-nested-routers==0.94.1 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/base.txt - # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via @@ -420,7 +418,6 @@ mozilla-django-oidc==4.0.0 mozilla-django-oidc-db[django-setup-configuration]==0.21.1 # via # -r requirements/base.txt - # mozilla-django-oidc-db # open-api-framework multidict==6.0.5 # via yarl @@ -488,7 +485,6 @@ pydantic-settings[yaml]==2.6.1 # via # -r requirements/base.txt # django-setup-configuration - # pydantic-settings pyflakes==3.0.1 # via flake8 pygments==2.15.1 From 0f370addb9e87f53cddd24fba6afcdf3ec84cc42 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 20 Dec 2024 11:13:59 +0100 Subject: [PATCH 3/5] :heavy_plus_sign: Add pytest/docs deps to CI deps for docs build --- requirements/base.txt | 10 +++++++--- requirements/ci.in | 4 ---- requirements/ci.txt | 31 +++++++++++++++++++++++++++---- requirements/dev.in | 4 ---- requirements/dev.txt | 31 +++++++++++++++++++++++++++---- requirements/test-tools.in | 7 +++++++ 6 files changed, 68 insertions(+), 19 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2fd5cc1..90ac5d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --no-emit-index-url requirements/base.in @@ -195,7 +195,9 @@ drf-nested-routers==0.94.1 # -r requirements/base.in # commonground-api-common drf-spectacular[sidecar]==0.27.2 - # via open-api-framework + # via + # drf-spectacular + # open-api-framework drf-spectacular-sidecar==2024.7.1 # via drf-spectacular drf-yasg==1.21.7 @@ -275,7 +277,9 @@ pydantic==2.9.2 pydantic-core==2.23.4 # via pydantic pydantic-settings[yaml]==2.6.1 - # via django-setup-configuration + # via + # django-setup-configuration + # pydantic-settings pyjwt==2.7.0 # via # commonground-api-common diff --git a/requirements/ci.in b/requirements/ci.in index 9ae16b9..ec8ac8a 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -1,6 +1,2 @@ codecov coverage - -# Documentation -sphinx -sphinx_rtd_theme diff --git a/requirements/ci.txt b/requirements/ci.txt index 46f3d40..3e2b661 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/ci.in requirements/test-tools.in @@ -104,6 +104,8 @@ commonground-api-common==2.1.0 # via # -r requirements/base.txt # open-api-framework +commonmark==0.9.1 + # via recommonmark coreapi==2.3.3 # via # -r requirements/base.txt @@ -266,6 +268,7 @@ django-solo==2.0.0 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 # via # -r requirements/base.txt + # django-two-factor-auth # maykin-2fa django-webtest==1.9.10 # via -r requirements/test-tools.in @@ -295,8 +298,10 @@ djangorestframework-inclusions==1.2.0 # open-api-framework docutils==0.21.2 # via + # recommonmark # sphinx # sphinx-rtd-theme + # sphinx-tabs drf-nested-routers==0.94.1 # via # -r requirements/base.txt @@ -304,6 +309,7 @@ drf-nested-routers==0.94.1 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/base.txt + # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via @@ -361,6 +367,8 @@ inflection==0.5.1 # -r requirements/base.txt # drf-spectacular # drf-yasg +iniconfig==2.0.0 + # via pytest iso-639==0.4.5 # via # -r requirements/base.txt @@ -411,6 +419,7 @@ mozilla-django-oidc==4.0.0 mozilla-django-oidc-db[django-setup-configuration]==0.21.1 # via # -r requirements/base.txt + # mozilla-django-oidc-db # open-api-framework multidict==6.0.5 # via yarl @@ -435,6 +444,7 @@ packaging==23.1 # -r requirements/base.txt # black # drf-yasg + # pytest # sphinx pathspec==0.12.1 # via black @@ -444,6 +454,8 @@ phonenumberslite==8.13.30 # django-two-factor-auth platformdirs==4.3.6 # via black +pluggy==1.5.0 + # via pytest prometheus-client==0.20.0 # via # -r requirements/base.txt @@ -475,10 +487,13 @@ pydantic-settings[yaml]==2.6.1 # via # -r requirements/base.txt # django-setup-configuration + # pydantic-settings pyflakes==3.2.0 # via flake8 pygments==2.18.0 - # via sphinx + # via + # sphinx + # sphinx-tabs pyjwt==2.7.0 # via # -r requirements/base.txt @@ -495,6 +510,8 @@ pyrsistent==0.19.3 # via # -r requirements/base.txt # jsonschema +pytest==8.3.4 + # via -r requirements/test-tools.in python-dateutil==2.8.2 # via # -r requirements/base.txt @@ -528,6 +545,8 @@ qrcode==6.1 # via # -r requirements/base.txt # django-two-factor-auth +recommonmark==0.7.1 + # via -r requirements/test-tools.in redis==4.5.5 # via # -r requirements/base.txt @@ -573,11 +592,15 @@ soupsieve==2.4.1 # via beautifulsoup4 sphinx==8.1.3 # via - # -r requirements/ci.in + # -r requirements/test-tools.in + # recommonmark # sphinx-rtd-theme + # sphinx-tabs # sphinxcontrib-jquery sphinx-rtd-theme==3.0.2 - # via -r requirements/ci.in + # via -r requirements/test-tools.in +sphinx-tabs==3.4.7 + # via -r requirements/test-tools.in sphinxcontrib-applehelp==2.0.0 # via sphinx sphinxcontrib-devhelp==2.0.0 diff --git a/requirements/dev.in b/requirements/dev.in index ad0e948..4d1a098 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -5,7 +5,3 @@ bumpversion # Debug tooling django-debug-toolbar django-extensions - -# Documentation -sphinx -sphinx_rtd_theme diff --git a/requirements/dev.txt b/requirements/dev.txt index 869eb98..67c0b88 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --no-emit-index-url --output-file=requirements/dev.txt requirements/base.txt requirements/dev.in requirements/test-tools.in @@ -109,6 +109,8 @@ commonground-api-common==2.1.0 # via # -r requirements/base.txt # open-api-framework +commonmark==0.9.1 + # via recommonmark coreapi==2.3.3 # via # -r requirements/base.txt @@ -273,6 +275,7 @@ django-solo==2.0.0 django-two-factor-auth[phonenumberslite,webauthn]==1.16.0 # via # -r requirements/base.txt + # django-two-factor-auth # maykin-2fa django-webtest==1.9.10 # via -r requirements/test-tools.in @@ -302,8 +305,10 @@ djangorestframework-inclusions==1.2.0 # open-api-framework docutils==0.18.1 # via + # recommonmark # sphinx # sphinx-rtd-theme + # sphinx-tabs drf-nested-routers==0.94.1 # via # -r requirements/base.txt @@ -311,6 +316,7 @@ drf-nested-routers==0.94.1 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/base.txt + # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via @@ -368,6 +374,8 @@ inflection==0.5.1 # -r requirements/base.txt # drf-spectacular # drf-yasg +iniconfig==2.0.0 + # via pytest iso-639==0.4.5 # via # -r requirements/base.txt @@ -418,6 +426,7 @@ mozilla-django-oidc==4.0.0 mozilla-django-oidc-db[django-setup-configuration]==0.21.1 # via # -r requirements/base.txt + # mozilla-django-oidc-db # open-api-framework multidict==6.0.5 # via yarl @@ -443,6 +452,7 @@ packaging==23.1 # black # build # drf-yasg + # pytest # sphinx pathspec==0.11.1 # via black @@ -454,6 +464,8 @@ pip-tools==7.3.0 # via -r requirements/dev.in platformdirs==3.5.1 # via black +pluggy==1.5.0 + # via pytest prometheus-client==0.20.0 # via # -r requirements/base.txt @@ -485,10 +497,13 @@ pydantic-settings[yaml]==2.6.1 # via # -r requirements/base.txt # django-setup-configuration + # pydantic-settings pyflakes==3.0.1 # via flake8 pygments==2.15.1 - # via sphinx + # via + # sphinx + # sphinx-tabs pyjwt==2.7.0 # via # -r requirements/base.txt @@ -507,6 +522,8 @@ pyrsistent==0.19.3 # via # -r requirements/base.txt # jsonschema +pytest==8.3.4 + # via -r requirements/test-tools.in python-dateutil==2.8.2 # via # -r requirements/base.txt @@ -540,6 +557,8 @@ qrcode==6.1 # via # -r requirements/base.txt # django-two-factor-auth +recommonmark==0.7.1 + # via -r requirements/test-tools.in redis==4.5.5 # via # -r requirements/base.txt @@ -584,11 +603,15 @@ soupsieve==2.4.1 # via beautifulsoup4 sphinx==6.2.1 # via - # -r requirements/dev.in + # -r requirements/test-tools.in + # recommonmark # sphinx-rtd-theme + # sphinx-tabs # sphinxcontrib-jquery sphinx-rtd-theme==1.2.0 - # via -r requirements/dev.in + # via -r requirements/test-tools.in +sphinx-tabs==3.4.7 + # via -r requirements/test-tools.in sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 diff --git a/requirements/test-tools.in b/requirements/test-tools.in index 850fe83..fdae972 100644 --- a/requirements/test-tools.in +++ b/requirements/test-tools.in @@ -6,8 +6,15 @@ pyquery # integrates with webtest requests-mock tblib vcrpy +pytest # Code formatting black isort flake8 + +# Documentation +sphinx +sphinx-rtd-theme +sphinx-tabs +recommonmark From 805f8dd861f603b1c223ef5690ab2229f18abbf9 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 20 Dec 2024 11:22:36 +0100 Subject: [PATCH 4/5] :construction_worker: [maykinmedia/open-api-framework#92] Fix docs build --- .bumpversion.cfg | 4 ++++ docs/conf.py | 6 +++--- src/objecttypes/__init__.py | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bdccf04..b961596 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -16,3 +16,7 @@ replace = "version": "{new_version}", [bumpversion:file:publiccode.yaml] search = softwareVersion: {current_version} replace = softwareVersion: {new_version} + +[bumpversion:file:src/openzaak/__init__.py] +search = __version__ = "{current_version}" +replace = __version__ = "{new_version}" diff --git a/docs/conf.py b/docs/conf.py index fc2a50e..8d2ad5a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -10,7 +10,7 @@ sys.path.insert(0, os.path.abspath("../src")) -import objects # noqa isort:skip +import objecttypes # noqa isort:skip # from objects.setup import setup_env # noqa isort:skip @@ -26,10 +26,10 @@ project = "Objects and Objecttypes API" copyright = "2020, Maykin Media" -author = objects.__author__ +author = objecttypes.__author__ # The full version, including alpha/beta/rc tags -release = objects.__version__ +release = objecttypes.__version__ # -- General configuration --------------------------------------------------- diff --git a/src/objecttypes/__init__.py b/src/objecttypes/__init__.py index e69de29..b8d9077 100644 --- a/src/objecttypes/__init__.py +++ b/src/objecttypes/__init__.py @@ -0,0 +1,3 @@ +__version__ = "2.2.2" +__author__ = "Maykin Media" +__homepage__ = "https://github.com/maykinmedia/objecttypes-api" From 2071501944891168cbb9585249517712b7465b03 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 20 Dec 2024 11:35:19 +0100 Subject: [PATCH 5/5] test --- .github/workflows/ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d0be7b..bed093c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,18 @@ jobs: main-branch: 'master' python-version: '3.11' docker-image-name: ${{ needs.store-reusable-workflow-vars.outputs.image-name }} - run-docs: true + run-docs: false + + dummy-job: + runs-on: ubuntu-latest + name: Dummy Job to Test Workflow + needs: + - open-api-ci + steps: + - name: Echo Dummy Test + run: echo "This is a dummy job to test the workflow execution." + + open-api-publish: uses: maykinmedia/open-api-workflows/.github/workflows/publish.yml@v1