Skip to content

Commit 6b0c677

Browse files
committed
Merge v2.9-dev from branch 'develop'
2 parents 4694bdc + a66cd8e commit 6b0c677

3 files changed

Lines changed: 18 additions & 8 deletions

File tree

ALL-for-build/Makedir/conf.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ def merge_settings_file(fpath, D, notes):
167167
master_doc = os.path.splitext(ospsplit(masterdocabspath)[1])[0]
168168
todo_include_todos = False
169169
exclude_patterns = []
170+
# Keep in sync with Defaults.cfg:
170171
extensions_to_be_loaded = [
171172
'sphinx.ext.autodoc',
172173
'sphinx.ext.coverage',
@@ -176,6 +177,8 @@ def merge_settings_file(fpath, D, notes):
176177
'sphinx.ext.intersphinx',
177178
'sphinx.ext.mathjax',
178179
'sphinx.ext.todo',
180+
'sphinx_copybutton',
181+
'sphinx_tabs.tabs',
179182
'sphinx_typo3_theme',
180183
'sphinxcontrib.gitloginfo',
181184
'sphinxcontrib.phpdomain',
@@ -185,10 +188,12 @@ def merge_settings_file(fpath, D, notes):
185188
'sphinxcontrib.t3tablerows',
186189
'sphinxcontrib.t3targets',
187190
'sphinxcontrib.youtube',
188-
'sphinx_tabs.tabs',
189191
]
190192

191193
# Legal extensions will be loaded if requested in Settings.cfg or Overrides.cfg
194+
# Actually, this is not activated at the moment. Any (available) extension may
195+
# be requested in Settings.cfg
196+
192197
legal_extensions = [
193198
# to be extended ...
194199
]
@@ -315,7 +320,8 @@ def updateModuleGlobals(GLOBALS, US):
315320

316321
for k, e in US.get('extensions', {}).items():
317322
if not e in GLOBALS['extensions']:
318-
if e in legal_extensions:
323+
# DISABLED: check for legal_extensions
324+
if True or e in legal_extensions:
319325
GLOBALS['extensions'].append(e)
320326

321327
for k, v in US.get('extlinks', {}).items():

ALL-for-build/venv/requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Sphinx==1.8.5
22
sphinx-typo3-theme
33
sphinx-rtd-theme
4+
pathlib2
45
pillow
56
beautifulsoup4
67
lxml
@@ -14,9 +15,11 @@ sphinxcontrib-plantuml
1415
sphinx-tabs
1516
subprocess32
1617
https://github.com/TYPO3-Documentation/sphinx-contrib-slide/archive/v1.1.0.zip
18+
https://github.com/TYPO3-Documentation/sphinx-contrib-youtube/archive/t3v1.1.0.zip
1719
https://github.com/TYPO3-Documentation/sphinxcontrib.t3fieldlisttable/archive/v0.3.1.zip
1820
https://github.com/TYPO3-Documentation/sphinxcontrib.t3tablerows/archive/v0.3.1.zip
1921
https://github.com/TYPO3-Documentation/sphinxcontrib.t3targets/archive/v0.3.4.zip
20-
https://github.com/TYPO3-Documentation/sphinx-contrib-youtube/archive/t3v1.1.0.zip
2122
https://github.com/TYPO3-Documentation/t3SphinxTools_includecheck/archive/v1.0.0.zip
2223
https://github.com/marble/TCT/archive/develop.zip
24+
https://github.com/TYPO3-Documentation/sphinx-copybutton/archive/refs/heads/hacked-for-python27.zip
25+

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:20.04
22
# Reflect the development progress. Set to the release number or something
33
# like vX.Y-dev
4-
ARG OUR_IMAGE_VERSION=v2.8.3
4+
ARG OUR_IMAGE_VERSION=v2.9-dev
55
# Specify tag. Should be 'latest' or 'develop' or '<RELEASE_VERSION>' where
6-
# release version looks like 'v2.8.3'
7-
ARG OUR_IMAGE_TAG=latest
6+
# release version looks like 'v2.9.0'
7+
ARG OUR_IMAGE_TAG=develop
88
#
99
# flag for apt-get - affects only build time
1010
ARG DEBIAN_FRONTEND=noninteractive
@@ -30,7 +30,7 @@ ENV \
3030
PIP_CACHE_DIR="/ALL/userhome/.cache/pip" \
3131
PIP_DISABLE_PIP_VERSION_CHECK=1 \
3232
PIP_NO_PYTHON_VERSION_WARNING=1 \
33-
THEME_MTIME="1616756420" \
33+
THEME_MTIME="1626861600" \
3434
THEME_NAME="unknown" \
3535
THEME_VERSION="unknown" \
3636
TOOLCHAIN_TOOL_VERSION="develop (1.2.0-dev)" \
@@ -123,7 +123,8 @@ RUN \
123123
&& if [ -f "Pipfile.lock" ]; then mv Pipfile.lock Pipfile.lock.DISABLED; fi \
124124
\
125125
&& virtualenv .venv \
126-
&& .venv/bin/pip install -r requirements.txt \
126+
&& .venv/bin/pip install --upgrade --disable-pip-version-check install pip pathlib2 \
127+
&& .venv/bin/pip install --disable-pip-version-check install -r requirements.txt \
127128
&& echo source $(pwd)/.venv/bin/activate >>$HOME/.bashrc \
128129
\
129130
&& COMMENT bash -c 'find /ALL/Downloads -name "*.whl" -exec .venv/bin/pip install -v {} \;' \

0 commit comments

Comments
 (0)