Skip to content

Commit

Permalink
Merge branch 'rtd-build' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
RKrahl committed Oct 9, 2024
2 parents 70d153b + 4ec4be7 commit c8fc162
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rst-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
- name: doc8-check
uses: deep-entertainment/doc8-action@v4
uses: deep-entertainment/doc8-action@v5
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PYTHON = python3
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXPROJ = PIDINST
Expand All @@ -18,7 +19,7 @@ $(BUILDERS): $(STATIC_SOURCEDIRS) _meta.py
$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

_meta.py:
python3 setup.py meta
$(PYTHON) setup.py meta

clean:
rm -rf __pycache__
Expand Down
10 changes: 10 additions & 0 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# full list see the documentation:
# http://www.sphinx-doc.org/en/master/config

import os
from pathlib import Path
import sys

Expand Down Expand Up @@ -90,6 +91,15 @@
#
# html_theme_options = {}

# Define the canonical URL if you are using a custom domain on Read the Docs
html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")

# Tell Jinja2 templates the build is running on Read the Docs
if os.environ.get("READTHEDOCS", "") == "True":
if "html_context" not in globals():
html_context = {}
html_context["READTHEDOCS"] = True

# 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".
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
from setuptools import setup
import setuptools.command.install
from distutils import log
import datetime
import os
from pathlib import Path
import subprocess
import gitprops

version = str(gitprops.get_version())
Expand Down

0 comments on commit c8fc162

Please sign in to comment.