From f6c614937185645648556104ee6cb7c055a57dc3 Mon Sep 17 00:00:00 2001
From: Mark Gibbs <delsim@users.noreply.github.com>
Date: Thu, 16 Apr 2020 20:41:47 -0700
Subject: [PATCH] Merge changes

Fix up merged changes
---
 django_plotly_dash/version.py |   2 +-
 docs/installation.rst         |   5 +
 docs/introduction.rst         |   2 +-
 frozen_dev.txt                | 196 ++++++++++++++++------------------
 setup.py                      |   4 +-
 5 files changed, 102 insertions(+), 107 deletions(-)

diff --git a/django_plotly_dash/version.py b/django_plotly_dash/version.py
index 29cdca8..84b2729 100644
--- a/django_plotly_dash/version.py
+++ b/django_plotly_dash/version.py
@@ -23,4 +23,4 @@ SOFTWARE.
 
 '''
 
-__version__ = "1.2.0"
+__version__ = "1.3.1"
diff --git a/docs/installation.rst b/docs/installation.rst
index 3e1038f..5be492e 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -20,6 +20,11 @@ Then, add ``django_plotly_dash`` to ``INSTALLED_APPS`` in the Django ``settings.
 The project directory name ``django_plotly_dash`` can also be used on its own if preferred, but this will stop the use of readable application names in
 the Django admin interface.
 
+Also, enable the use of frames within HTML documents by also adding to the ``settings.py`` file::
+
+    X_FRAME_OPTIONS = 'SAMEORIGIN'
+
+
 Further, if the :ref:`header and footer <plotly_header_footer>` tags are in use
 then ``django_plotly_dash.middleware.BaseMiddleware`` should be added to ``MIDDLEWARE`` in the same file. This
 can be safely added now even if not used.
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 8f70595..9acd5b5 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -15,7 +15,7 @@ these features:
 There is nothing here that cannot be achieved through expanding the Flask app around Plotly Dash, or indeed by using an alternative web
 framework. The purpose of this project is to enable the above features, given that the choice to use Django has already been made.
 
-The source code can be found in `this github repository <https://https://github.com/GibbsConsulting/django-plotly-dash>`_. This repository also includes
+The source code can be found in `this github repository <https://github.com/GibbsConsulting/django-plotly-dash>`_. This repository also includes
 a self-contained demo application, which can also be viewed `online <https://djangoplotlydash.com>`_.
 
 .. _overview:
diff --git a/frozen_dev.txt b/frozen_dev.txt
index b7b9c5a..aa8c69e 100644
--- a/frozen_dev.txt
+++ b/frozen_dev.txt
@@ -1,129 +1,119 @@
-aioredis==1.2.0
+aioredis==1.3.1
 alabaster==0.7.12
 argh==0.26.2
-asgiref==3.1.2
-asn1crypto==0.24.0
-astroid==2.2.5
-async-timeout==2.0.1
-atomicwrites==1.3.0
-attrs==19.1.0
-autobahn==19.6.2
-Automat==0.7.0
-Babel==2.7.0
-beautifulsoup4==4.7.1
-bleach==3.1.0
-certifi==2019.6.16
-cffi==1.12.3
-channels==2.2.0
-channels-redis==2.3.2
+asgiref==3.2.7
+astroid==2.3.3
+async-timeout==3.0.1
+attrs==19.3.0
+autobahn==20.4.2
+Automat==20.2.0
+Babel==2.8.0
+beautifulsoup4==4.9.0
+bleach==3.1.4
+certifi==2020.4.5.1
+cffi==1.14.0
+channels==2.4.0
+channels-redis==2.4.2
 chardet==3.0.4
-Click==7.0
+click==7.1.1
 constantly==15.1.0
-coverage==4.5.3
-coveralls==1.8.1
-cryptography==2.7
-daphne==2.3.0
-dash==1.0.0
-dash-bootstrap-components==0.6.2
-dash-core-components==1.0.0
-dash-html-components==1.0.0
-dash-renderer==1.0.0
-dash-table==4.0.0
-decorator==4.4.0
-Django==2.2.2
-django-bootstrap4==0.0.8
--e git+https://github.com/delsim/django-plotly-dash.git@0a58348f6e3c212623ef8a9cefdaee7cc3c46ed9#egg=django_plotly_dash
-django-redis==4.10.0
+coverage==5.1
+coveralls==2.0.0
+cryptography==2.9
+daphne==2.5.0
+dash==1.10.0
+dash-bootstrap-components==0.9.2
+dash-core-components==1.9.0
+dash-html-components==1.0.3
+dash-renderer==1.3.0
+dash-table==4.6.2
+Django==3.0.5
+django-bootstrap4==1.1.1
+-e git+https://delsim@github.com/delsim/django-plotly-dash.git@2810d13d1da7799e76c4f1db55a347432b093b99#egg=django_plotly_dash
+django-redis==4.11.0
 docopt==0.6.2
-docutils==0.14
+docutils==0.16
 dpd-components==0.1.0
-dpd-static-support==0.0.4
-Flask==1.0.3
+dpd-static-support==0.0.5
+Flask==1.1.2
 Flask-Compress==1.4.0
+future==0.18.2
 grip==4.5.2
-hiredis==1.0.0
+hiredis==1.0.1
 hyperlink==19.0.0
-idna==2.8
-imagesize==1.1.0
-importlib-metadata==0.18
+idna==2.9
+imagesize==1.2.0
+importlib-metadata==1.6.0
 incremental==17.5.0
-ipython-genutils==0.2.0
 isort==4.3.21
 itsdangerous==1.1.0
-Jinja2==2.10.1
-jsonschema==3.0.1
-jupyter-core==4.5.0
-lazy-object-proxy==1.4.1
+jeepney==0.4.3
+Jinja2==2.11.2
+keyring==21.2.0
+lazy-object-proxy==1.4.3
 livereload==2.6.1
-lxml==4.3.4
-Markdown==3.1.1
+Markdown==3.2.1
 MarkupSafe==1.1.1
 mccabe==0.6.1
-more-itertools==7.0.0
-msgpack==0.5.6
-nbformat==4.4.0
-numpy==1.16.4
-packaging==19.0
-pandas==0.24.2
+more-itertools==8.2.0
+msgpack==0.6.2
+numpy==1.18.2
+packaging==20.3
+pandas==1.0.3
 path-and-address==2.0.1
-pathlib2==2.3.4
 pathtools==0.1.2
-percy==2.0.2
 pkg-resources==0.0.0
 pkginfo==1.5.0.1
-plotly==3.10.0
-pluggy==0.12.0
+plotly==4.6.0
+pluggy==0.13.1
 port-for==0.3.1
-py==1.8.0
-pycparser==2.19
-Pygments==2.4.2
-PyHamcrest==1.9.0
-pylint==2.3.1
-pyOpenSSL==19.0.0
-pyparsing==2.4.0
-pyrsistent==0.15.2
-pytest==4.6.3
-pytest-cov==2.7.1
-pytest-django==3.5.0
-pytest-mock==1.10.4
-pytest-sugar==0.9.2
-python-coveralls==2.9.2
-python-dateutil==2.8.0
-pytz==2019.1
-PyYAML==5.1.1
-readme-renderer==24.0
-redis==3.2.1
-requests==2.22.0
+py==1.8.1
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycparser==2.20
+Pygments==2.6.1
+PyHamcrest==2.0.2
+pylint==2.4.4
+pyOpenSSL==19.1.0
+pyparsing==2.4.7
+pytest==5.4.1
+pytest-cov==2.8.1
+pytest-django==3.9.0
+python-coveralls==2.9.3
+python-dateutil==2.8.1
+pytz==2019.3
+PyYAML==5.3.1
+readme-renderer==25.0
+redis==3.4.1
+requests==2.23.0
 requests-toolbelt==0.9.1
 retrying==1.3.3
-selenium==3.141.0
-six==1.12.0
-snowballstemmer==1.2.1
-soupsieve==1.9.2
-Sphinx==2.1.2
+SecretStorage==3.1.2
+service-identity==18.1.0
+six==1.14.0
+snowballstemmer==2.0.0
+soupsieve==2.0
+Sphinx==3.0.1
 sphinx-autobuild==0.7.1
-sphinxcontrib-applehelp==1.0.1
-sphinxcontrib-devhelp==1.0.1
-sphinxcontrib-htmlhelp==1.0.2
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.2
-sphinxcontrib-serializinghtml==1.1.3
-sqlparse==0.3.0
-termcolor==1.1.0
-tornado==6.0.3
-tqdm==4.32.2
-traitlets==4.3.2
-twine==1.13.0
-Twisted==19.2.1
-txaio==18.8.1
-typed-ast==1.4.0
-urllib3==1.25.3
-waitress==1.3.0
-watchdog==0.9.0
-wcwidth==0.1.7
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
+sqlparse==0.3.1
+tornado==6.0.4
+tqdm==4.45.0
+twine==3.1.1
+Twisted==20.3.0
+txaio==20.4.1
+typed-ast==1.4.1
+urllib3==1.25.9
+watchdog==0.10.2
+wcwidth==0.1.9
 webencodings==0.5.1
-Werkzeug==0.15.4
-whitenoise==4.1.2
+Werkzeug==1.0.1
+whitenoise==5.0.1
 wrapt==1.11.2
-zipp==0.5.1
-zope.interface==4.6.0
+zipp==3.1.0
+zope.interface==5.1.0
diff --git a/setup.py b/setup.py
index d42a254..58fb2d4 100644
--- a/setup.py
+++ b/setup.py
@@ -42,9 +42,9 @@ setup(
     },
     install_requires = ['plotly',
                         'dash<1.11',
-                        'dash-core-components',
+                        'dash-core-components==1.9.0',
                         'dash-html-components',
-                        'dash-renderer',
+                        'dash-renderer==1.3.0',
                         'dpd-components',
                         'Django>=3',
                         'Flask>=1.0.2'],
-- 
GitLab