diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 47570dc6b..a97657e77 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -7,12 +7,14 @@ on: - main - "[0-9].[0-9]+-branch" tags: + - "*" # Build pull requests pull_request: jobs: test: strategy: + fail-fast: false matrix: py: - "3.6" diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d45905a5d..e44650bca 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: '3.11' + python: '3.8' sphinx: configuration: docs/conf.py formats: diff --git a/docs/conf.py b/docs/conf.py index bcf72e864..506376660 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,7 +57,7 @@ def nothing(*arg): 'sphinxcontrib.autoprogram', 'sphinx_copybutton', # enable pylons_sphinx_latesturl when this branch is no longer "latest" - # 'pylons_sphinx_latesturl', + 'pylons_sphinx_latesturl', ] # Looks for objects in external projects @@ -127,26 +127,26 @@ def nothing(*arg): # Options for HTML output # ----------------------- # enable pylons_sphinx_latesturl when this branch is no longer "latest" -# pylons_sphinx_latesturl_base = ( -# 'https://docs.pylonsproject.org/projects/pyramid/en/latest/') -# pylons_sphinx_latesturl_pagename_overrides = { -# # map old pagename -> new pagename -# 'whatsnew-1.0': 'index', -# 'whatsnew-1.1': 'index', -# 'whatsnew-1.2': 'index', -# 'whatsnew-1.3': 'index', -# 'whatsnew-1.4': 'index', -# 'whatsnew-1.5': 'index', -# 'whatsnew-1.6': 'index', -# 'whatsnew-1.7': 'index', -# 'whatsnew-1.8': 'index', -# 'whatsnew-1.9': 'index', -# 'whatsnew-1.10': 'index', -# 'whatsnew-2.0': 'index', -# 'tutorials/gae/index': 'index', -# 'api/chameleon_text': 'api', -# 'api/chameleon_zpt': 'api', -# } +pylons_sphinx_latesturl_base = ( + 'https://docs.pylonsproject.org/projects/pyramid/en/latest/') +pylons_sphinx_latesturl_pagename_overrides = { + # map old pagename -> new pagename + 'whatsnew-1.0': 'index', + 'whatsnew-1.1': 'index', + 'whatsnew-1.2': 'index', + 'whatsnew-1.3': 'index', + 'whatsnew-1.4': 'index', + 'whatsnew-1.5': 'index', + 'whatsnew-1.6': 'index', + 'whatsnew-1.7': 'index', + 'whatsnew-1.8': 'index', + 'whatsnew-1.9': 'index', + 'whatsnew-1.10': 'index', + 'whatsnew-2.0': 'index', + 'tutorials/gae/index': 'index', + 'api/chameleon_text': 'api', + 'api/chameleon_zpt': 'api', +} html_theme = 'pyramid' html_theme_path = pylons_sphinx_themes.get_html_themes_path() @@ -156,7 +156,7 @@ def nothing(*arg): # pre-release status: true; else: false. in_progress='false', # On branches previous to "latest": true; else: false. - outdated='false', + outdated='true', ) # Control display of sidebars diff --git a/setup.py b/setup.py index c7cade0fc..3e5cf9c4a 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ def readfile(name): 'coverage', 'pytest>=5.4.2', # unittest.TestCase funkyness, see commit 77c1505ab 'pytest-cov', + 'setuptools < 82', # require pkg_resources ] branch_version = ".".join(VERSION.split(".")[:2])