8000 Fixes test suite by FinalAngel · Pull Request #6688 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

Fixes test suite #6688

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 7 commits into from
Jun 7, 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
fix tests
  • Loading branch information
FinalAngel committed Jun 6, 2019
commit a5d2a7ff9e85e628e3397c1a5fad74c1ab9619be
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
15 changes: 8 additions & 7 deletions docs/reference/api_references.rst
8000
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
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==2.1
sphinxcontrib-spelling
pyflakes==1.1.0
pyenchant
Expand Down
0