Skip to content

Commit f5369e2

Browse files
authored
Merge branch '6-dev' into PLONE_BACKEND_VERSION-no-minor-version
2 parents 0641cf0 + a7e2930 commit f5369e2

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ linkcheck: deps ## Run linkcheck
189189

190190
.PHONY: linkcheckbroken
191191
linkcheckbroken: deps ## Run linkcheck and show only broken links
192-
cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | GREP_COLORS='0;31' grep -wi "broken\|redirect" --color=auto || test $$? = 1
192+
cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | grep -wi "broken\|redirect" | GREP_COLORS='0;31' grep -vi "https://github.com/plone/volto/issues/" --color=auto || test $$? = 1
193193
@echo
194194
@echo "Link check complete; look for any errors in the above output " \
195195
"or in $(BUILDDIR)/linkcheck/ ."

docs/backend/upgrading/version-specific-migration/upgrade-to-python3.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,6 @@ These should be changed so that Python 3 is the default.
305305
For example, string types (or text) should be represented as `'foo'`, not `u'foo'`, and bytes types (or data) should be represented as `b'bar'`, not `'bar'`.
306306
Search for examples of `Py23DocChecker` in Plone's packages to find a pattern which allows updated doctests to pass in Python 2.
307307

308-
- To test your code against `buildout.coredev`, start by browsing to [Add-ons \[Jenkins\]](https://jenkins.plone.org/view/Add-ons/).
309-
- Note there are jobs set up for Plone 4.3, 5.0, 5.1, and 5.2 on Python 2, and three jobs that run tests for Plone 5.2 on Python 3.6, Python 3.7, Python 3.8, and Python 3.9.
310-
- Click the link {guilabel}`log in` on Jenkins website (top right).
311-
For the first login, you must authorize Jenkins to have access to your GitHub account to authenticate.
312-
- Click the link for the job you want to run.
313-
For example, {guilabel}`Test add-on against Plone 5.2 on Python3.8`.
314-
- Choose the link {guilabel}`Build with parameters` in the menu on the left-hand side.
315-
- Fill the fields {guilabel}`ADDON_URL` and {guilabel}`ADDON_BRANCH` with your repository's URL and the branch name ("python3" if you followed these instructions).
316-
- Start the build with the {guilabel}`Build` button.
317-
318308

319309
## 7. Update add-on information
320310

0 commit comments

Comments
 (0)