From 13c30668bef07f467ebb62d50eaa7bab37f1226a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 13 Jul 2023 12:02:50 -0600 Subject: [PATCH 1/6] Update click from 8.1.3 to 8.1.5 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d33044a..9f76d1f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ email_validator==2.0.0.post2 pydantic==1.10.8 simpleeval==0.9.13 Sphinx==7.0.1 -Click==8.1.3 +Click==8.1.5 sphinx-autodoc-typehints==1.23.4 sphinxcontrib.spelling==5.4.0 sphinxcontrib.apidoc==0.3.0 From 62a9802c0b6f55e0c150a628847e772ab3fa8a21 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 13 Jul 2023 12:02:50 -0600 Subject: [PATCH 2/6] Update click from 8.1.3 to 8.1.5 --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index bc15ef9..a0742ad 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -7,7 +7,7 @@ tox==4.5.1 coverage==7.2.5 Sphinx==7.0.1 twine==4.0.2 -Click==8.1.3 +Click==8.1.5 pytest==7.3.1 black==23.3.0 sphinx-autodoc-napoleon-typehints==2.1.6 From 4005f76361bd806ca4c3cbf48f764b64ded452c1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 6 Sep 2023 10:20:06 -0600 Subject: [PATCH 3/6] Update coverage from 7.2.5 to 7.3.1 --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index bc15ef9..b6c6476 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -4,7 +4,7 @@ wheel==0.40.0 watchdog==3.0.0 flake8==6.0.0 tox==4.5.1 -coverage==7.2.5 +coverage==7.3.1 Sphinx==7.0.1 twine==4.0.2 Click==8.1.3 From 52babecf76c2250ebaa691a380016787347a8a7f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 17 Sep 2023 23:19:59 -0600 Subject: [PATCH 4/6] Update typing-extensions from 4.5.0 to 4.8.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fdfc4da..36267fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ Jinja2==3.1.2 pydantic==1.10.8 requests==2.31.0 simpleeval==0.9.13 -typing-extensions==4.5.0;python_version<"3.8" +typing-extensions==4.8.0;python_version<"3.8" From bd704491f13d3716b6d33c929185373ef44c0239 Mon Sep 17 00:00:00 2001 From: Carlos de la Guardia Date: Tue, 3 Oct 2023 17:35:35 -0600 Subject: [PATCH 5/6] pin pydantic version in setup.py too --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index fdfc4da..c03a0a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ email_validator==2.0.0.post2 Jinja2==3.1.2 -pydantic==1.10.8 +pydantic==1.10.11 requests==2.31.0 simpleeval==0.9.13 typing-extensions==4.5.0;python_version<"3.8" diff --git a/setup.py b/setup.py index 476464e..a713883 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ "Click>=7.0", "email_validator", "Jinja2", - "pydantic", + "pydantic==1.10.11", "requests", "simpleeval", ] From 72a8a7e161a928ca0a100719b223eca8ca070a80 Mon Sep 17 00:00:00 2001 From: Carlos de la Guardia Date: Thu, 5 Oct 2023 18:10:02 -0600 Subject: [PATCH 6/6] fix problem with panel containers --- questions/form.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/questions/form.py b/questions/form.py index e48e805..4f8ef6c 100644 --- a/questions/form.py +++ b/questions/form.py @@ -256,7 +256,13 @@ def _add_elements(self, survey, form, top_level=False, container_name="questions self._add_elements(page, element.form) survey.pages.append(page) elif isinstance(element, (FormPage, FormPanel)): - container = getattr(survey, container_name) + container = getattr(survey, container_name, None) + if container is None: + pages = survey.pages + if len(pages) > 0: + container = getattr(pages[0], container_name) + if container is None: + raise "Error in form definition: container not found." if element.dynamic: panel = PanelDynamicBlock(name=name, **element.params) new_container_name = "template_elements"