8000 Backport 3.7.1 release to develop by FinalAngel · Pull Request #6773 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

Backport 3.7.1 release to develop #6773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes test suite (#6688) (#6692)
* add information for testing

* fix tests

* updated CHANGELOG

* update

* 1.8.5

* fix tests locally

* update text
  • Loading branch information
FinalAngel authored Jun 25, 2019
commit 28d4902f26a58efd09b07fdae9d6de8999b28165
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dist
.project
.coverage
.pydevproject
.vscode
.settings
/*.egg-info/
/*.egg/
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,3 @@ notifications:
irc:
- irc.freenode.org#django-cms
- irc.freenode.org#django-cms-sprint
webhooks:
- http://addons.us-iad-rs.aldryn.io/en/travis-endpoint/
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
=== 3.7.0 (unreleased) ===

* Introduced Django 2.2 support.
* Fixed test suite.


=== 3.6.0 (2019-01-29) ===
Expand Down
4 changes: 3 additions & 1 deletion cms/tests/test_apphooks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import sys
import mock

from django.contrib.admin.models import CHANGE, LogEntry
from django.contrib.auth import get_user_model
Expand Down Expand Up @@ -855,7 +856,8 @@ def test_get_menus(self):

request = self.get_request('/')
renderer = menu_pool.get_renderer(request)
nodes = renderer.get_nodes()
with mock.patch("menus.menu_pool.logger.error"):
nodes = renderer.get_nodes()
nodes_urls = [node.url for node in nodes]
self.assertTrue(reverse('sample-account') in nodes_urls)
self.assertFalse('/en/child_page/page2/' in nodes_urls)
Expand Down
3 changes: 2 additions & 1 deletion cms/tests/test_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import sys

from django.utils.six.moves import StringIO
from sphinx.application import Sphinx, SphinxWarning
from sphinx.application import Sphinx
from sphinx.errors import SphinxWarning

try:
import enchant
Expand Down
12 changes: 9 additions & 3 deletions docs/contributing/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ We are working to improve the performance and reliability of our test suite. We'
problems, but need feedback from people using a wide range of systems and configurations in order
to benefit from their experience.

Please use the open issue `#3684 Test suite is error-prone
<https://github.com/divio/django-cms/issues/3684>`_ on our GitHub repository to report such
problems.
Please report any issues on our `GitHub repository <https://github.com/divio/django-cms/issues>`_.

If you can help *improve* the test suite, your input will be especially valuable.

Expand Down Expand Up @@ -96,6 +94,14 @@ when the entire suite is run. To work around this you can invoke the test class
and it should then run without errors.


``ERROR: zlib is required unless explicitly disabled using --disable-zlib, aborting``
------------------------------------------------------------------------------------------

If you run into that issue, make sure to install zlib using Homebrew::

brew install libjpeg zlib && brew link --force zlib


Advanced testing options
========================

Expand Down
15 changes: 8 additions & 7 deletions docs/reference/api_references.rst
DEB2
Original file line number Diff line number Diff line change
Expand Up @@ -221,33 +221,34 @@ add a text plugin with the content ``'hello world'``. This is done in English::
cms.constants
*************

.. module:: cms.constants
.. module:: cms.constants

.. data:: TEMPLATE_INHERITANCE_MAGIC
.. data:: TEMPLATE_INHERITANCE_MAGIC

The token used to identify when a user selects "inherit" as template for a
page.

.. data:: LEFT
.. data:: LEFT

Used as a position indicator in the toolbar.

.. data:: RIGHT
.. data:: RIGHT

Used as a position indicator in the toolbar.

.. data:: REFRESH
.. data:: REFRESH

Constant used by the toolbar.

.. data:: EXPIRE_NOW
.. data:: EXPIRE_NOW

Constant of 0 (zero) used for cache control headers

.. data:: MAX_EXPIRATION_TTL
.. data:: MAX_EXPIRATION_TTL

Constant of 31536000 or 365 days in seconds used for cache control headers


************
cms.app_base
************
Expand Down
1 change: 1 addition & 0 deletions docs/reference/toolbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ django CMS constants used in toolbars
*************************************

.. module:: cms.constants
:noindex:

.. data:: REFRESH_PAGE

Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-f http://simple.crate.io/
MarkupSafe==0.23
Pygments==2.0.2
sphinx
Expand Down
1 change: 1 addition & 0 deletions docs/upgrade/3.7.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Improvements and new features
=============================

* introduced support for Django 2.2
* Fixed test suite.


*********************
Expand Down
4 changes: 2 additions & 2 deletions test_requirements/requirements_base.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
coverage==4.2
python-coveralls==2.5.0
unittest-xml-reporting==1.11.0
Pillow==3.3.2
Pillow==5.2.0
django-treebeard>=4.3
argparse
dj-database-url
Expand All @@ -12,7 +12,7 @@ https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
https://github.com/ojii/django-better-test/archive/8aa2407d097fe3789b74682f0e6bd7d15d449416.zip#egg=django-better-test
https://github.com/ojii/django-app-manage/archive/65da18ef234a4e985710c2c0ec760023695b40fe.zip#egg=django-app-manage
iptools
sphinx==1.4.5
sphinx==1.8.5
sphinxcontrib-spelling
pyflakes==1.1.0
pyenchant
Expand Down
0