From 32f3a387ae0531b7e6289a343a1645fa730f8c69 Mon Sep 17 00:00:00 2001 From: iron3oxide <98779754+iron3oxide@users.noreply.github.com> Date: Wed, 10 May 2023 08:01:25 +0200 Subject: [PATCH] Rename var module to vars (#983) --- pynecone/__init__.py | 2 +- pynecone/compiler/compiler.py | 2 +- pynecone/compiler/utils.py | 2 +- pynecone/components/base/bare.py | 2 +- pynecone/components/base/link.py | 2 +- pynecone/components/component.py | 2 +- pynecone/components/datadisplay/badge.py | 2 +- pynecone/components/datadisplay/code.py | 2 +- pynecone/components/datadisplay/datatable.py | 2 +- pynecone/components/datadisplay/divider.py | 2 +- pynecone/components/datadisplay/list.py | 2 +- pynecone/components/datadisplay/stat.py | 2 +- pynecone/components/datadisplay/table.py | 2 +- pynecone/components/disclosure/accordion.py | 2 +- pynecone/components/disclosure/tabs.py | 2 +- pynecone/components/feedback/alert.py | 2 +- pynecone/components/feedback/circularprogress.py | 2 +- pynecone/components/feedback/progress.py | 2 +- pynecone/components/feedback/skeleton.py | 2 +- pynecone/components/feedback/spinner.py | 2 +- pynecone/components/forms/button.py | 2 +- pynecone/components/forms/checkbox.py | 2 +- pynecone/components/forms/copytoclipboard.py | 2 +- pynecone/components/forms/editable.py | 2 +- pynecone/components/forms/formcontrol.py | 2 +- pynecone/components/forms/iconbutton.py | 2 +- pynecone/components/forms/input.py | 2 +- pynecone/components/forms/numberinput.py | 2 +- pynecone/components/forms/password.py | 2 +- pynecone/components/forms/pininput.py | 2 +- pynecone/components/forms/radio.py | 2 +- pynecone/components/forms/rangeslider.py | 2 +- pynecone/components/forms/select.py | 2 +- pynecone/components/forms/slider.py | 2 +- pynecone/components/forms/switch.py | 2 +- pynecone/components/forms/textarea.py | 2 +- pynecone/components/forms/upload.py | 2 +- pynecone/components/graphing/plotly.py | 2 +- pynecone/components/graphing/victory.py | 2 +- pynecone/components/layout/aspect_ratio.py | 2 +- pynecone/components/layout/box.py | 2 +- pynecone/components/layout/cond.py | 4 ++-- pynecone/components/layout/container.py | 2 +- pynecone/components/layout/flex.py | 2 +- pynecone/components/layout/foreach.py | 2 +- pynecone/components/layout/grid.py | 2 +- pynecone/components/layout/stack.py | 2 +- pynecone/components/layout/wrap.py | 2 +- pynecone/components/media/avatar.py | 2 +- pynecone/components/media/image.py | 2 +- pynecone/components/navigation/breadcrumb.py | 2 +- pynecone/components/navigation/link.py | 2 +- pynecone/components/navigation/linkoverlay.py | 2 +- pynecone/components/navigation/nextlink.py | 2 +- pynecone/components/overlay/alertdialog.py | 2 +- pynecone/components/overlay/drawer.py | 2 +- pynecone/components/overlay/menu.py | 2 +- pynecone/components/overlay/modal.py | 2 +- pynecone/components/overlay/popover.py | 2 +- pynecone/components/overlay/tooltip.py | 2 +- pynecone/components/tags/cond_tag.py | 2 +- pynecone/components/tags/iter_tag.py | 2 +- pynecone/components/tags/tag.py | 2 +- pynecone/components/typography/heading.py | 2 +- pynecone/components/typography/highlight.py | 2 +- pynecone/components/typography/markdown.py | 2 +- pynecone/components/typography/span.py | 2 +- pynecone/components/typography/text.py | 2 +- pynecone/el/elements/__init__.py | 2 +- pynecone/event.py | 2 +- pynecone/state.py | 2 +- pynecone/style.py | 2 +- pynecone/utils/format.py | 2 +- pynecone/utils/imports.py | 2 +- pynecone/{var.py => vars.py} | 0 tests/compiler/test_compiler.py | 2 +- tests/components/datadisplay/conftest.py | 10 +++++----- tests/components/layout/test_cond.py | 2 +- tests/components/test_component.py | 2 +- tests/components/test_tag.py | 2 +- tests/test_event.py | 2 +- tests/test_state.py | 2 +- tests/test_style.py | 2 +- tests/test_utils.py | 2 +- tests/test_var.py | 2 +- 85 files changed, 89 insertions(+), 89 deletions(-) rename pynecone/{var.py => vars.py} (100%) diff --git a/pynecone/__init__.py b/pynecone/__init__.py index 54eac6370..800179272 100644 --- a/pynecone/__init__.py +++ b/pynecone/__init__.py @@ -30,4 +30,4 @@ from .route import route as route from .state import ComputedVar as var from .state import State as State from .style import toggle_color_mode as toggle_color_mode -from .var import Var as Var +from .vars import Var as Var diff --git a/pynecone/compiler/compiler.py b/pynecone/compiler/compiler.py index fae707013..c449691f5 100644 --- a/pynecone/compiler/compiler.py +++ b/pynecone/compiler/compiler.py @@ -10,7 +10,7 @@ from pynecone.components.component import Component, CustomComponent from pynecone.state import State from pynecone.style import Style from pynecone.utils import imports -from pynecone.var import ImportVar +from pynecone.vars import ImportVar # Imports to be included in every Pynecone app. DEFAULT_IMPORTS: imports.ImportDict = { diff --git a/pynecone/compiler/utils.py b/pynecone/compiler/utils.py index d569f3cd2..2c9671c50 100644 --- a/pynecone/compiler/utils.py +++ b/pynecone/compiler/utils.py @@ -23,7 +23,7 @@ from pynecone.event import get_hydrate_event from pynecone.state import State from pynecone.style import Style from pynecone.utils import format, imports, path_ops -from pynecone.var import ImportVar +from pynecone.vars import ImportVar # To re-export this function. merge_imports = imports.merge_imports diff --git a/pynecone/components/base/bare.py b/pynecone/components/base/bare.py index abf5ffe88..70eaa441f 100644 --- a/pynecone/components/base/bare.py +++ b/pynecone/components/base/bare.py @@ -6,7 +6,7 @@ from typing import Any from pynecone.components.component import Component from pynecone.components.tags import Tag from pynecone.components.tags.tagless import Tagless -from pynecone.var import Var +from pynecone.vars import Var class Bare(Component): diff --git a/pynecone/components/base/link.py b/pynecone/components/base/link.py index fcfe34ac3..a728a5492 100644 --- a/pynecone/components/base/link.py +++ b/pynecone/components/base/link.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component -from pynecone.var import Var +from pynecone.vars import Var class Link(Component): diff --git a/pynecone/components/component.py b/pynecone/components/component.py index efa1e4a86..24bd6eff0 100644 --- a/pynecone/components/component.py +++ b/pynecone/components/component.py @@ -22,7 +22,7 @@ from pynecone.event import ( ) from pynecone.style import Style from pynecone.utils import format, imports, types -from pynecone.var import BaseVar, ImportVar, Var +from pynecone.vars import BaseVar, ImportVar, Var class Component(Base, ABC): diff --git a/pynecone/components/datadisplay/badge.py b/pynecone/components/datadisplay/badge.py index 3962d03ee..163d46486 100644 --- a/pynecone/components/datadisplay/badge.py +++ b/pynecone/components/datadisplay/badge.py @@ -1,7 +1,7 @@ """Badge component.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Badge(ChakraComponent): diff --git a/pynecone/components/datadisplay/code.py b/pynecone/components/datadisplay/code.py index 0f25fb9bf..6a1c11d24 100644 --- a/pynecone/components/datadisplay/code.py +++ b/pynecone/components/datadisplay/code.py @@ -6,7 +6,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.style import Style from pynecone.utils import imports -from pynecone.var import ImportVar, Var +from pynecone.vars import ImportVar, Var # Path to the prism styles. PRISM_STYLES_PATH = "/styles/code/prism" diff --git a/pynecone/components/datadisplay/datatable.py b/pynecone/components/datadisplay/datatable.py index 3f3277b42..34ca285cb 100644 --- a/pynecone/components/datadisplay/datatable.py +++ b/pynecone/components/datadisplay/datatable.py @@ -5,7 +5,7 @@ from typing import Any, List from pynecone.components.component import Component from pynecone.components.tags import Tag from pynecone.utils import format, imports, types -from pynecone.var import BaseVar, ComputedVar, ImportVar, Var +from pynecone.vars import BaseVar, ComputedVar, ImportVar, Var class Gridjs(Component): diff --git a/pynecone/components/datadisplay/divider.py b/pynecone/components/datadisplay/divider.py index 1ea71854c..1a84f3fb7 100644 --- a/pynecone/components/datadisplay/divider.py +++ b/pynecone/components/datadisplay/divider.py @@ -1,7 +1,7 @@ """A line to divide parts of the layout.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Divider(ChakraComponent): diff --git a/pynecone/components/datadisplay/list.py b/pynecone/components/datadisplay/list.py index f37a63fc3..03f2f5955 100644 --- a/pynecone/components/datadisplay/list.py +++ b/pynecone/components/datadisplay/list.py @@ -3,7 +3,7 @@ from pynecone.components import Component from pynecone.components.layout.foreach import Foreach from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class List(ChakraComponent): diff --git a/pynecone/components/datadisplay/stat.py b/pynecone/components/datadisplay/stat.py index 5e121ad33..11fa807a7 100644 --- a/pynecone/components/datadisplay/stat.py +++ b/pynecone/components/datadisplay/stat.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Stat(ChakraComponent): diff --git a/pynecone/components/datadisplay/table.py b/pynecone/components/datadisplay/table.py index caa442de3..8e3a097de 100644 --- a/pynecone/components/datadisplay/table.py +++ b/pynecone/components/datadisplay/table.py @@ -3,7 +3,7 @@ from pynecone.components.component import Component from pynecone.components.layout.foreach import Foreach from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Table(ChakraComponent): diff --git a/pynecone/components/disclosure/accordion.py b/pynecone/components/disclosure/accordion.py index 3afb75fca..584ffe99b 100644 --- a/pynecone/components/disclosure/accordion.py +++ b/pynecone/components/disclosure/accordion.py @@ -4,7 +4,7 @@ from typing import List, Optional, Union from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Accordion(ChakraComponent): diff --git a/pynecone/components/disclosure/tabs.py b/pynecone/components/disclosure/tabs.py index fedef2932..5d33a57ab 100644 --- a/pynecone/components/disclosure/tabs.py +++ b/pynecone/components/disclosure/tabs.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Tabs(ChakraComponent): diff --git a/pynecone/components/feedback/alert.py b/pynecone/components/feedback/alert.py index aeaa594ac..2c284be61 100644 --- a/pynecone/components/feedback/alert.py +++ b/pynecone/components/feedback/alert.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Alert(ChakraComponent): diff --git a/pynecone/components/feedback/circularprogress.py b/pynecone/components/feedback/circularprogress.py index 063445a0a..43fc83b73 100644 --- a/pynecone/components/feedback/circularprogress.py +++ b/pynecone/components/feedback/circularprogress.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class CircularProgress(ChakraComponent): diff --git a/pynecone/components/feedback/progress.py b/pynecone/components/feedback/progress.py index bb585e50e..8785b14e6 100644 --- a/pynecone/components/feedback/progress.py +++ b/pynecone/components/feedback/progress.py @@ -3,7 +3,7 @@ from typing import Union from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Progress(ChakraComponent): diff --git a/pynecone/components/feedback/skeleton.py b/pynecone/components/feedback/skeleton.py index 9826b8ff9..c87b9051e 100644 --- a/pynecone/components/feedback/skeleton.py +++ b/pynecone/components/feedback/skeleton.py @@ -1,7 +1,7 @@ """Container to stack elements with spacing.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Skeleton(ChakraComponent): diff --git a/pynecone/components/feedback/spinner.py b/pynecone/components/feedback/spinner.py index 746616177..747032dad 100644 --- a/pynecone/components/feedback/spinner.py +++ b/pynecone/components/feedback/spinner.py @@ -1,7 +1,7 @@ """Container to stack elements with spacing.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Spinner(ChakraComponent): diff --git a/pynecone/components/forms/button.py b/pynecone/components/forms/button.py index 3a024e12a..40cc6c19a 100644 --- a/pynecone/components/forms/button.py +++ b/pynecone/components/forms/button.py @@ -1,7 +1,7 @@ """A button component.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Button(ChakraComponent): diff --git a/pynecone/components/forms/checkbox.py b/pynecone/components/forms/checkbox.py index 7082c3f64..495a8275d 100644 --- a/pynecone/components/forms/checkbox.py +++ b/pynecone/components/forms/checkbox.py @@ -4,7 +4,7 @@ from typing import Dict from pynecone.components.component import EVENT_ARG from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Checkbox(ChakraComponent): diff --git a/pynecone/components/forms/copytoclipboard.py b/pynecone/components/forms/copytoclipboard.py index cd253ed69..28334a156 100644 --- a/pynecone/components/forms/copytoclipboard.py +++ b/pynecone/components/forms/copytoclipboard.py @@ -3,7 +3,7 @@ from typing import Set from pynecone.components import Component -from pynecone.var import Var +from pynecone.vars import Var class CopyToClipboard(Component): diff --git a/pynecone/components/forms/editable.py b/pynecone/components/forms/editable.py index 417c49c44..58b2febec 100644 --- a/pynecone/components/forms/editable.py +++ b/pynecone/components/forms/editable.py @@ -4,7 +4,7 @@ from typing import Dict from pynecone.components.libs.chakra import ChakraComponent from pynecone.event import EVENT_ARG -from pynecone.var import Var +from pynecone.vars import Var class Editable(ChakraComponent): diff --git a/pynecone/components/forms/formcontrol.py b/pynecone/components/forms/formcontrol.py index 46e493d8b..ecb81a654 100644 --- a/pynecone/components/forms/formcontrol.py +++ b/pynecone/components/forms/formcontrol.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class FormControl(ChakraComponent): diff --git a/pynecone/components/forms/iconbutton.py b/pynecone/components/forms/iconbutton.py index f2b0f57c8..ef65c13d5 100644 --- a/pynecone/components/forms/iconbutton.py +++ b/pynecone/components/forms/iconbutton.py @@ -1,7 +1,7 @@ """An icon button component.""" from pynecone.components.typography.text import Text -from pynecone.var import Var +from pynecone.vars import Var class IconButton(Text): diff --git a/pynecone/components/forms/input.py b/pynecone/components/forms/input.py index 1561152f9..3d479a678 100644 --- a/pynecone/components/forms/input.py +++ b/pynecone/components/forms/input.py @@ -5,7 +5,7 @@ from typing import Dict from pynecone.components.component import EVENT_ARG from pynecone.components.libs.chakra import ChakraComponent from pynecone.utils import imports -from pynecone.var import ImportVar, Var +from pynecone.vars import ImportVar, Var class Input(ChakraComponent): diff --git a/pynecone/components/forms/numberinput.py b/pynecone/components/forms/numberinput.py index 91e85865f..00c64e62d 100644 --- a/pynecone/components/forms/numberinput.py +++ b/pynecone/components/forms/numberinput.py @@ -5,7 +5,7 @@ from typing import Dict from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.event import EVENT_ARG -from pynecone.var import Var +from pynecone.vars import Var class NumberInput(ChakraComponent): diff --git a/pynecone/components/forms/password.py b/pynecone/components/forms/password.py index ac1453706..1d7397757 100644 --- a/pynecone/components/forms/password.py +++ b/pynecone/components/forms/password.py @@ -1,7 +1,7 @@ """A password input component.""" from pynecone.components.forms.input import Input -from pynecone.var import Var +from pynecone.vars import Var class Password(Input): diff --git a/pynecone/components/forms/pininput.py b/pynecone/components/forms/pininput.py index d8ebc2dec..1a2e0f51b 100644 --- a/pynecone/components/forms/pininput.py +++ b/pynecone/components/forms/pininput.py @@ -5,7 +5,7 @@ from typing import Dict from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.event import EVENT_ARG -from pynecone.var import Var +from pynecone.vars import Var class PinInput(ChakraComponent): diff --git a/pynecone/components/forms/radio.py b/pynecone/components/forms/radio.py index 9abcb4237..946311649 100644 --- a/pynecone/components/forms/radio.py +++ b/pynecone/components/forms/radio.py @@ -9,7 +9,7 @@ from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.typography.text import Text from pynecone.event import EVENT_ARG from pynecone.utils import types -from pynecone.var import Var +from pynecone.vars import Var class RadioGroup(ChakraComponent): diff --git a/pynecone/components/forms/rangeslider.py b/pynecone/components/forms/rangeslider.py index c87187c9d..0bda15d41 100644 --- a/pynecone/components/forms/rangeslider.py +++ b/pynecone/components/forms/rangeslider.py @@ -5,7 +5,7 @@ from typing import Dict, List from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.event import EVENT_ARG -from pynecone.var import Var +from pynecone.vars import Var class RangeSlider(ChakraComponent): diff --git a/pynecone/components/forms/select.py b/pynecone/components/forms/select.py index 0409fa5b1..d49c963d8 100644 --- a/pynecone/components/forms/select.py +++ b/pynecone/components/forms/select.py @@ -7,7 +7,7 @@ from pynecone.components.layout.foreach import Foreach from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.typography.text import Text from pynecone.utils import types -from pynecone.var import Var +from pynecone.vars import Var class Select(ChakraComponent): diff --git a/pynecone/components/forms/slider.py b/pynecone/components/forms/slider.py index 5745678c8..09efcfea5 100644 --- a/pynecone/components/forms/slider.py +++ b/pynecone/components/forms/slider.py @@ -5,7 +5,7 @@ from typing import Dict from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.event import EVENT_ARG -from pynecone.var import Var +from pynecone.vars import Var class Slider(ChakraComponent): diff --git a/pynecone/components/forms/switch.py b/pynecone/components/forms/switch.py index f69c30845..5faeda732 100644 --- a/pynecone/components/forms/switch.py +++ b/pynecone/components/forms/switch.py @@ -3,7 +3,7 @@ from typing import Dict from pynecone.components.component import EVENT_ARG from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Switch(ChakraComponent): diff --git a/pynecone/components/forms/textarea.py b/pynecone/components/forms/textarea.py index b5f41aca0..be5644522 100644 --- a/pynecone/components/forms/textarea.py +++ b/pynecone/components/forms/textarea.py @@ -4,7 +4,7 @@ from typing import Dict from pynecone.components.component import EVENT_ARG from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class TextArea(ChakraComponent): diff --git a/pynecone/components/forms/upload.py b/pynecone/components/forms/upload.py index 2ad327001..424fbf9ca 100644 --- a/pynecone/components/forms/upload.py +++ b/pynecone/components/forms/upload.py @@ -6,7 +6,7 @@ from pynecone.components.component import EVENT_ARG, Component from pynecone.components.forms.input import Input from pynecone.components.layout.box import Box from pynecone.event import EventChain -from pynecone.var import BaseVar, Var +from pynecone.vars import BaseVar, Var upload_file = BaseVar(name="e => File(e)", type_=EventChain) diff --git a/pynecone/components/graphing/plotly.py b/pynecone/components/graphing/plotly.py index 959121823..a730a72aa 100644 --- a/pynecone/components/graphing/plotly.py +++ b/pynecone/components/graphing/plotly.py @@ -6,7 +6,7 @@ from plotly.graph_objects import Figure from pynecone.components.component import Component from pynecone.components.tags import Tag -from pynecone.var import Var +from pynecone.vars import Var class PlotlyLib(Component): diff --git a/pynecone/components/graphing/victory.py b/pynecone/components/graphing/victory.py index 1a6374aa0..49e2e5736 100644 --- a/pynecone/components/graphing/victory.py +++ b/pynecone/components/graphing/victory.py @@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional, Union from pynecone.components.component import Component from pynecone.style import Style -from pynecone.var import Var +from pynecone.vars import Var def format_xy(x: List, y: List) -> List: diff --git a/pynecone/components/layout/aspect_ratio.py b/pynecone/components/layout/aspect_ratio.py index 83d343499..f2c6f4138 100644 --- a/pynecone/components/layout/aspect_ratio.py +++ b/pynecone/components/layout/aspect_ratio.py @@ -1,7 +1,7 @@ """A AspectRatio component.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class AspectRatio(ChakraComponent): diff --git a/pynecone/components/layout/box.py b/pynecone/components/layout/box.py index fb3b31462..4e3db0c9c 100644 --- a/pynecone/components/layout/box.py +++ b/pynecone/components/layout/box.py @@ -2,7 +2,7 @@ from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.tags import Tag -from pynecone.var import Var +from pynecone.vars import Var class Box(ChakraComponent): diff --git a/pynecone/components/layout/cond.py b/pynecone/components/layout/cond.py index 543194ee6..e67be3448 100644 --- a/pynecone/components/layout/cond.py +++ b/pynecone/components/layout/cond.py @@ -7,7 +7,7 @@ from pynecone.components.component import Component from pynecone.components.layout.fragment import Fragment from pynecone.components.tags import CondTag, Tag from pynecone.utils import format -from pynecone.var import Var +from pynecone.vars import Var class Cond(Component): @@ -93,7 +93,7 @@ def cond(condition: Any, c1: Any, c2: Any = None): ValueError: If the arguments are invalid. """ # Import here to avoid circular imports. - from pynecone.var import BaseVar, Var + from pynecone.vars import BaseVar, Var # Convert the condition to a Var. cond_var = Var.create(condition) diff --git a/pynecone/components/layout/container.py b/pynecone/components/layout/container.py index 7496c2d53..206f86cfb 100644 --- a/pynecone/components/layout/container.py +++ b/pynecone/components/layout/container.py @@ -1,7 +1,7 @@ """A flexbox container.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Container(ChakraComponent): diff --git a/pynecone/components/layout/flex.py b/pynecone/components/layout/flex.py index c43cfb805..3a0396ecc 100644 --- a/pynecone/components/layout/flex.py +++ b/pynecone/components/layout/flex.py @@ -1,7 +1,7 @@ """A reflexive container component.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Flex(ChakraComponent): diff --git a/pynecone/components/layout/foreach.py b/pynecone/components/layout/foreach.py index 8380bb3d5..098449747 100644 --- a/pynecone/components/layout/foreach.py +++ b/pynecone/components/layout/foreach.py @@ -5,7 +5,7 @@ from typing import Any, Callable, List from pynecone.components.component import Component from pynecone.components.tags import IterTag -from pynecone.var import BaseVar, Var, get_unique_variable_name +from pynecone.vars import BaseVar, Var, get_unique_variable_name class Foreach(Component): diff --git a/pynecone/components/layout/grid.py b/pynecone/components/layout/grid.py index 94294304b..1efe36bdd 100644 --- a/pynecone/components/layout/grid.py +++ b/pynecone/components/layout/grid.py @@ -3,7 +3,7 @@ from typing import List from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Grid(ChakraComponent): diff --git a/pynecone/components/layout/stack.py b/pynecone/components/layout/stack.py index b0a6fe86d..c110aa6e4 100644 --- a/pynecone/components/layout/stack.py +++ b/pynecone/components/layout/stack.py @@ -1,7 +1,7 @@ """Container to stack elements with spacing.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Stack(ChakraComponent): diff --git a/pynecone/components/layout/wrap.py b/pynecone/components/layout/wrap.py index 2ff07f763..006212648 100644 --- a/pynecone/components/layout/wrap.py +++ b/pynecone/components/layout/wrap.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Wrap(ChakraComponent): diff --git a/pynecone/components/media/avatar.py b/pynecone/components/media/avatar.py index 6fc1a8833..f562601b7 100644 --- a/pynecone/components/media/avatar.py +++ b/pynecone/components/media/avatar.py @@ -3,7 +3,7 @@ from typing import Set from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Avatar(ChakraComponent): diff --git a/pynecone/components/media/image.py b/pynecone/components/media/image.py index bf516d930..83199c2b5 100644 --- a/pynecone/components/media/image.py +++ b/pynecone/components/media/image.py @@ -5,7 +5,7 @@ from typing import Optional, Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Image(ChakraComponent): diff --git a/pynecone/components/navigation/breadcrumb.py b/pynecone/components/navigation/breadcrumb.py index 091bc4b6a..53aee7ec2 100644 --- a/pynecone/components/navigation/breadcrumb.py +++ b/pynecone/components/navigation/breadcrumb.py @@ -2,7 +2,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Breadcrumb(ChakraComponent): diff --git a/pynecone/components/navigation/link.py b/pynecone/components/navigation/link.py index 74b3ed205..b209aa5f2 100644 --- a/pynecone/components/navigation/link.py +++ b/pynecone/components/navigation/link.py @@ -3,7 +3,7 @@ from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.navigation.nextlink import NextLink -from pynecone.var import Var +from pynecone.vars import Var class Link(ChakraComponent): diff --git a/pynecone/components/navigation/linkoverlay.py b/pynecone/components/navigation/linkoverlay.py index 68a065692..350fbcd33 100644 --- a/pynecone/components/navigation/linkoverlay.py +++ b/pynecone/components/navigation/linkoverlay.py @@ -1,7 +1,7 @@ """Link overlay components.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class LinkOverlay(ChakraComponent): diff --git a/pynecone/components/navigation/nextlink.py b/pynecone/components/navigation/nextlink.py index 08970836f..3e3491923 100644 --- a/pynecone/components/navigation/nextlink.py +++ b/pynecone/components/navigation/nextlink.py @@ -1,7 +1,7 @@ """A link component.""" from pynecone.components.component import Component -from pynecone.var import Var +from pynecone.vars import Var class NextLink(Component): diff --git a/pynecone/components/overlay/alertdialog.py b/pynecone/components/overlay/alertdialog.py index c0a2a28f4..46b095f6d 100644 --- a/pynecone/components/overlay/alertdialog.py +++ b/pynecone/components/overlay/alertdialog.py @@ -5,7 +5,7 @@ from typing import Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.media.icon import Icon -from pynecone.var import Var +from pynecone.vars import Var class AlertDialog(ChakraComponent): diff --git a/pynecone/components/overlay/drawer.py b/pynecone/components/overlay/drawer.py index 977ba8d49..a832ba596 100644 --- a/pynecone/components/overlay/drawer.py +++ b/pynecone/components/overlay/drawer.py @@ -5,7 +5,7 @@ from typing import Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.media.icon import Icon -from pynecone.var import Var +from pynecone.vars import Var class Drawer(ChakraComponent): diff --git a/pynecone/components/overlay/menu.py b/pynecone/components/overlay/menu.py index 50018f8e1..1b6619434 100644 --- a/pynecone/components/overlay/menu.py +++ b/pynecone/components/overlay/menu.py @@ -4,7 +4,7 @@ from typing import Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Menu(ChakraComponent): diff --git a/pynecone/components/overlay/modal.py b/pynecone/components/overlay/modal.py index 59b617179..85d4f8264 100644 --- a/pynecone/components/overlay/modal.py +++ b/pynecone/components/overlay/modal.py @@ -5,7 +5,7 @@ from typing import Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent from pynecone.components.media import Icon -from pynecone.var import Var +from pynecone.vars import Var class Modal(ChakraComponent): diff --git a/pynecone/components/overlay/popover.py b/pynecone/components/overlay/popover.py index 6d6583611..acd8a83eb 100644 --- a/pynecone/components/overlay/popover.py +++ b/pynecone/components/overlay/popover.py @@ -4,7 +4,7 @@ from typing import Set from pynecone.components.component import Component from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Popover(ChakraComponent): diff --git a/pynecone/components/overlay/tooltip.py b/pynecone/components/overlay/tooltip.py index 07cd15441..af0f719dc 100644 --- a/pynecone/components/overlay/tooltip.py +++ b/pynecone/components/overlay/tooltip.py @@ -3,7 +3,7 @@ from typing import Set from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Tooltip(ChakraComponent): diff --git a/pynecone/components/tags/cond_tag.py b/pynecone/components/tags/cond_tag.py index f66a2fe9b..18d79d246 100644 --- a/pynecone/components/tags/cond_tag.py +++ b/pynecone/components/tags/cond_tag.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Optional from pynecone.components.tags.tag import Tag -from pynecone.var import Var +from pynecone.vars import Var class CondTag(Tag): diff --git a/pynecone/components/tags/iter_tag.py b/pynecone/components/tags/iter_tag.py index cac7bfd4c..1bddef27a 100644 --- a/pynecone/components/tags/iter_tag.py +++ b/pynecone/components/tags/iter_tag.py @@ -5,7 +5,7 @@ import inspect from typing import TYPE_CHECKING, Callable, List from pynecone.components.tags.tag import Tag -from pynecone.var import Var +from pynecone.vars import Var if TYPE_CHECKING: from pynecone.components.component import Component diff --git a/pynecone/components/tags/tag.py b/pynecone/components/tags/tag.py index a8795e6dd..3479a08af 100644 --- a/pynecone/components/tags/tag.py +++ b/pynecone/components/tags/tag.py @@ -12,7 +12,7 @@ from plotly.io import to_json from pynecone.base import Base from pynecone.event import EventChain from pynecone.utils import format, types -from pynecone.var import Var +from pynecone.vars import Var if TYPE_CHECKING: from pynecone.components.component import ComponentStyle diff --git a/pynecone/components/typography/heading.py b/pynecone/components/typography/heading.py index 1952a5fb2..e13b95262 100644 --- a/pynecone/components/typography/heading.py +++ b/pynecone/components/typography/heading.py @@ -1,7 +1,7 @@ """A heading component.""" from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Heading(ChakraComponent): diff --git a/pynecone/components/typography/highlight.py b/pynecone/components/typography/highlight.py index 77a700bf6..e23658998 100644 --- a/pynecone/components/typography/highlight.py +++ b/pynecone/components/typography/highlight.py @@ -3,7 +3,7 @@ from typing import List from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Highlight(ChakraComponent): diff --git a/pynecone/components/typography/markdown.py b/pynecone/components/typography/markdown.py index d526b5468..8949d141e 100644 --- a/pynecone/components/typography/markdown.py +++ b/pynecone/components/typography/markdown.py @@ -5,7 +5,7 @@ from typing import List, Union from pynecone.components.component import Component from pynecone.utils import types -from pynecone.var import BaseVar, ImportVar, Var +from pynecone.vars import BaseVar, ImportVar, Var class Markdown(Component): diff --git a/pynecone/components/typography/span.py b/pynecone/components/typography/span.py index 9fccb9453..d65bb17c3 100644 --- a/pynecone/components/typography/span.py +++ b/pynecone/components/typography/span.py @@ -2,7 +2,7 @@ from __future__ import annotations from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Span(ChakraComponent): diff --git a/pynecone/components/typography/text.py b/pynecone/components/typography/text.py index 0436ab1b8..b76821339 100644 --- a/pynecone/components/typography/text.py +++ b/pynecone/components/typography/text.py @@ -2,7 +2,7 @@ from __future__ import annotations from pynecone.components.libs.chakra import ChakraComponent -from pynecone.var import Var +from pynecone.vars import Var class Text(ChakraComponent): diff --git a/pynecone/el/elements/__init__.py b/pynecone/el/elements/__init__.py index 055dbebff..2130b9e4d 100644 --- a/pynecone/el/elements/__init__.py +++ b/pynecone/el/elements/__init__.py @@ -2,7 +2,7 @@ from typing import Union from pynecone.el.element import Element -from pynecone.var import Var as PCVar +from pynecone.vars import Var as PCVar class A(Element): # noqa: E742 diff --git a/pynecone/event.py b/pynecone/event.py index 2ceac4c9c..1746678f0 100644 --- a/pynecone/event.py +++ b/pynecone/event.py @@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union from pynecone import constants from pynecone.base import Base from pynecone.utils import format -from pynecone.var import BaseVar, Var +from pynecone.vars import BaseVar, Var class Event(Base): diff --git a/pynecone/state.py b/pynecone/state.py index 62fca226a..ab3b5731b 100644 --- a/pynecone/state.py +++ b/pynecone/state.py @@ -28,7 +28,7 @@ from pynecone import constants from pynecone.base import Base from pynecone.event import Event, EventHandler, fix_events, window_alert from pynecone.utils import format, prerequisites, types -from pynecone.var import BaseVar, ComputedVar, PCDict, PCList, Var +from pynecone.vars import BaseVar, ComputedVar, PCDict, PCList, Var Delta = Dict[str, Any] diff --git a/pynecone/style.py b/pynecone/style.py index a42037b9f..11f341c53 100644 --- a/pynecone/style.py +++ b/pynecone/style.py @@ -5,7 +5,7 @@ from typing import Optional from pynecone import constants from pynecone.event import EventChain from pynecone.utils import format -from pynecone.var import BaseVar, Var +from pynecone.vars import BaseVar, Var toggle_color_mode = BaseVar(name=constants.TOGGLE_COLOR_MODE, type_=EventChain) diff --git a/pynecone/utils/format.py b/pynecone/utils/format.py index a8143c7ca..150c2193d 100644 --- a/pynecone/utils/format.py +++ b/pynecone/utils/format.py @@ -216,7 +216,7 @@ def format_cond( The formatted conditional expression. """ # Import here to avoid circular imports. - from pynecone.var import Var + from pynecone.vars import Var # Use Python truthiness. cond = f"isTrue({cond})" diff --git a/pynecone/utils/imports.py b/pynecone/utils/imports.py index a745dac1a..9ba2b4c7d 100644 --- a/pynecone/utils/imports.py +++ b/pynecone/utils/imports.py @@ -3,7 +3,7 @@ from collections import defaultdict from typing import Dict, Set -from pynecone.var import ImportVar +from pynecone.vars import ImportVar ImportDict = Dict[str, Set[ImportVar]] diff --git a/pynecone/var.py b/pynecone/vars.py similarity index 100% rename from pynecone/var.py rename to pynecone/vars.py diff --git a/tests/compiler/test_compiler.py b/tests/compiler/test_compiler.py index f70026716..19a4ccf8d 100644 --- a/tests/compiler/test_compiler.py +++ b/tests/compiler/test_compiler.py @@ -4,7 +4,7 @@ import pytest from pynecone.compiler import utils from pynecone.utils import imports -from pynecone.var import ImportVar +from pynecone.vars import ImportVar @pytest.mark.parametrize( diff --git a/tests/components/datadisplay/conftest.py b/tests/components/datadisplay/conftest.py index 12a9cf04c..9f9ebca52 100644 --- a/tests/components/datadisplay/conftest.py +++ b/tests/components/datadisplay/conftest.py @@ -36,7 +36,7 @@ def data_table_state2(): class DataTableState(pc.State): _data = pd.DataFrame() - @pc.var # type: ignore + @pc.var def data(self): return self._data @@ -55,11 +55,11 @@ def data_table_state3(): _data: List = [] _columns: List = ["col1", "col2"] - @pc.var # type: ignore + @pc.var def data(self) -> List: return self._data - @pc.var # type: ignore + @pc.var def columns(self): return self._columns @@ -78,11 +78,11 @@ def data_table_state4(): _data: List = [] _columns: List = ["col1", "col2"] - @pc.var # type: ignore + @pc.var def data(self): return self._data - @pc.var # type: ignore + @pc.var def columns(self) -> List: return self._columns diff --git a/tests/components/layout/test_cond.py b/tests/components/layout/test_cond.py index ac0a568d9..93ac2414a 100644 --- a/tests/components/layout/test_cond.py +++ b/tests/components/layout/test_cond.py @@ -7,7 +7,7 @@ import pynecone as pc from pynecone.components.layout.cond import Cond, cond from pynecone.components.layout.fragment import Fragment from pynecone.components.typography.text import Text -from pynecone.var import Var +from pynecone.vars import Var @pytest.fixture diff --git a/tests/components/test_component.py b/tests/components/test_component.py index 0be8f73bf..756c46450 100644 --- a/tests/components/test_component.py +++ b/tests/components/test_component.py @@ -9,7 +9,7 @@ from pynecone.event import EVENT_ARG, EVENT_TRIGGERS, EventHandler from pynecone.state import State from pynecone.style import Style from pynecone.utils import imports -from pynecone.var import ImportVar, Var +from pynecone.vars import ImportVar, Var @pytest.fixture diff --git a/tests/components/test_tag.py b/tests/components/test_tag.py index 597836299..d2f0e1ee7 100644 --- a/tests/components/test_tag.py +++ b/tests/components/test_tag.py @@ -4,7 +4,7 @@ import pytest from pynecone.components.tags import CondTag, Tag from pynecone.event import EVENT_ARG, EventChain, EventHandler, EventSpec -from pynecone.var import BaseVar, Var +from pynecone.vars import BaseVar, Var def mock_event(arg): diff --git a/tests/test_event.py b/tests/test_event.py index fee7e6b2c..d60ce0fb7 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -3,7 +3,7 @@ import pytest from pynecone import event from pynecone.event import Event, EventHandler, EventSpec from pynecone.utils import format -from pynecone.var import Var +from pynecone.vars import Var def make_var(value) -> Var: diff --git a/tests/test_state.py b/tests/test_state.py index a13c9a5ad..c49464511 100644 --- a/tests/test_state.py +++ b/tests/test_state.py @@ -8,7 +8,7 @@ from pynecone.constants import IS_HYDRATED, RouteVar from pynecone.event import Event, EventHandler from pynecone.state import State from pynecone.utils import format -from pynecone.var import BaseVar, ComputedVar +from pynecone.vars import BaseVar, ComputedVar class Object(Base): diff --git a/tests/test_style.py b/tests/test_style.py index c5c60305a..ac972a416 100644 --- a/tests/test_style.py +++ b/tests/test_style.py @@ -1,7 +1,7 @@ import pytest from pynecone import style -from pynecone.var import Var +from pynecone.vars import Var test_style = [ ({"a": 1}, {"a": 1}), diff --git a/tests/test_utils.py b/tests/test_utils.py index 9c1f979aa..0e6e23715 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -4,7 +4,7 @@ from typing import Any, List, Union import pytest from pynecone.utils import build, format, imports, prerequisites, types -from pynecone.var import Var +from pynecone.vars import Var @pytest.mark.parametrize( diff --git a/tests/test_var.py b/tests/test_var.py index 0fddba458..a140a5168 100644 --- a/tests/test_var.py +++ b/tests/test_var.py @@ -6,7 +6,7 @@ import pytest from pynecone.base import Base from pynecone.state import State -from pynecone.var import BaseVar, ComputedVar, ImportVar, PCDict, PCList, Var +from pynecone.vars import BaseVar, ComputedVar, ImportVar, PCDict, PCList, Var test_vars = [ BaseVar(name="prop1", type_=int),