Merge branch 'develop' into bug/Avaiga#2023-trap-focus-out

kart2004 · Nov 17, 2024 · 0f23946 · 0f23946
2 parents 848ae8c + 1668422
commit 0f23946
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 39 deletions.
diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
@@ -56,7 +56,7 @@ jobs:
         run: pip install --upgrade setuptools wheel
 
       - name: Install pipenv
-        run: pip install --upgrade pipenv
+        run: pip install pipenv --upgrade
 
       - name: Install Dependencies
         run: pipenv install --dev --python=${{ matrix.python-version }}
@@ -154,7 +154,7 @@ jobs:
 
       - name: Install pipenv
         if: steps.changes.outputs.core == 'true'
-        run: pip install --upgrade pipenv
+        run: pip install pipenv --upgrade
 
       - name: Install Dependencies
         if: steps.changes.outputs.core == 'true'
@@ -197,7 +197,7 @@ jobs:
 
       - name: Install pipenv
         if: steps.changes.outputs.core == 'true'
-        run: pip install --upgrade pipenv
+        run: pip install pipenv --upgrade
 
       - name: Install Dependencies
         if: steps.changes.outputs.core == 'true'

diff --git a/Pipfile b/Pipfile
@@ -8,9 +8,9 @@ apispec = {extras = ["yaml"], version = "==6.3"}
 apispec-webframeworks = "==0.5.2"
 cookiecutter = "==2.1.1"
 deepdiff = "==6.7.1"
-flask = "==3.0.0"
+flask = "==3.1.0"
 flask-cors = "==5.0.0"
-flask-socketio = "==5.3.6"
+flask-socketio = "==5.4.1"
 Flask-RESTful = ">=0.3.9"
 gevent = "==24.11.1"
 gevent-websocket = "==0.10.1"
@@ -21,7 +21,7 @@ marshmallow = "==3.20.1"
 networkx = "==2.6"
 openpyxl = "==3.1.2"
 pandas = "==1.3.5"
-pyarrow = "*"
+pyarrow = "==16.0.0"
 pymongo = {extras = ["srv"], version = "==4.6.3"}
 python-dotenv = "==1.0.0"
 python-magic = {version = "==0.4.24", markers="sys_platform != 'win32'"}

diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ image = [
     "python-magic-bin>=0.4.14,<0.5",
 ]
 rdp = ["rdp>=0.8"]
-arrow = ["pyarrow>=17.0.0,<18.0"]
+arrow = ["pyarrow>=16.0.0,<19.0"]
 mssql = ["pyodbc>=4"]
 
 [project.scripts]

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def run(self):
             "python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
         ],
         "rdp": ["rdp>=0.8"],
-        "arrow": ["pyarrow>=16.0.0,<18.0"],
+        "arrow": ["pyarrow>=16.0.0,<19.0"],
         "mssql": ["pyodbc>=4"],
     },
     cmdclass={"build_py": NPMInstall},

diff --git a/taipy/core/_entity/_entity.py b/taipy/core/_entity/_entity.py
@@ -33,8 +33,7 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
             for to_delete_key in self._properties._pending_deletions:
                 self._properties.data.pop(to_delete_key, None)
             self._properties.data.update(self._properties._pending_changes)
-        _Reloader._get_manager(self._MANAGER_NAME)._set(self)
+        _Reloader()._get_manager(self._MANAGER_NAME)._set(self)
 
         for event in self._in_context_attributes_changed_collector:
             Notifier.publish(event)
-        _Reloader._get_manager(self._MANAGER_NAME)._set(self)
diff --git a/taipy/core/_entity/_reload.py b/taipy/core/_entity/_reload.py
@@ -104,7 +104,6 @@ def __set_entity(fct):
         @functools.wraps(fct)
         def _do_set_entity(self, *args, **kwargs):
             fct(self, *args, **kwargs)
-            entity_manager = _Reloader._get_manager(manager)
             value = args[0] if len(args) == 1 else args
             event = _make_event(
                 self,
@@ -115,7 +114,7 @@ def _do_set_entity(self, *args, **kwargs):
             if not self._is_in_context:
                 entity = _Reloader()._reload(manager, self)
                 fct(entity, *args, **kwargs)
-                entity_manager._set(entity)
+                _Reloader._get_manager(manager)._set(entity)
                 Notifier.publish(event)
             else:
                 self._in_context_attributes_changed_collector.append(event)

diff --git a/taipy/core/pyproject.toml b/taipy/core/pyproject.toml
@@ -26,7 +26,7 @@ dynamic = ["version", "dependencies"]
 mssql = ["pyodbc>=4,<4.1"]
 mysql = ["pymysql>1,<1.1"]
 postgresql = ["psycopg2>2.9,<2.10"]
-parquet = ["fastparquet==2022.11.0", "pyarrow>=17.0.0,<18.0"]
+parquet = ["fastparquet==2022.11.0", "pyarrow>=16.0.0,<19.0"]
 s3 = ["boto3==1.29.1"]
 mongo = ["pymongo[srv]>=4.2.0,<5.0"]
 

diff --git a/taipy/core/setup.py b/taipy/core/setup.py
@@ -43,7 +43,7 @@ def get_requirements():
     "mssql": ["pyodbc>=4,<4.1"],
     "mysql": ["pymysql>1,<1.1"],
     "postgresql": ["psycopg2>2.9,<2.10"],
-    "parquet": ["fastparquet==2022.11.0", "pyarrow>=17.0.0,<18.0"],
+    "parquet": ["fastparquet==2022.11.0", "pyarrow>=16.0.0,<19.0"],
     "s3": ["boto3==1.29.1"],
     "mongo": ["pymongo[srv]>=4.2.0,<5.0"],
 }

diff --git a/taipy/gui/pyproject.toml b/taipy/gui/pyproject.toml
@@ -28,7 +28,7 @@ image = [
     "python-magic>=0.4.24,<0.5;platform_system!='Windows'",
     "python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
 ]
-arrow = ["pyarrow>=17.0.0,<18.0"]
+arrow = ["pyarrow>=16.0.0,<19.0"]
 
 [tool.setuptools.packages]
 find = {include = ["taipy", "taipy.gui", "taipy.gui.*"]}

diff --git a/taipy/gui/setup.py b/taipy/gui/setup.py
@@ -45,7 +45,7 @@ def get_requirements():
         "python-magic>=0.4.24,<0.5;platform_system!='Windows'",
         "python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
     ],
-    "arrow": ["pyarrow>=17.0.0,<18.0"],
+    "arrow": ["pyarrow>=16.0.0,<19.0"],
 }
 
 def _build_webapp():

diff --git a/tools/packages/pipfiles/Pipfile3.10.max b/tools/packages/pipfiles/Pipfile3.10.max
@@ -50,7 +50,7 @@ version = "==4.2.13"
 
 
 [packages]
-"pyarrow" = {version="==17.0.0"}
+"pyarrow" = {version="==18.0.0"}
 "networkx" = {version="==3.3", markers="python_version>'3.8'"}
 "openpyxl" = {version="==3.1.2"}
 "pandas" = {version="==2.2.2", markers="python_version>'3.8'"}
@@ -59,14 +59,14 @@ version = "==4.2.13"
 "toml" = {version="==0.10.2"}
 "boto3" = {version="==1.34.113"}
 "cookiecutter" = {version="==2.6.0"}
-"flask" = {version="==3.0.3"}
+"flask" = {version="==3.1.0"}
 "flask-cors" = {version="==5.0.0"}
-"flask-socketio" = {version="==5.3.6"}
+"flask-socketio" = {version="==5.4.1"}
 "markdown" = {version="==3.6"}
 "python-dotenv" = {version="==1.0.1"}
 "pytz" = {version="==2024.1"}
 "tzlocal" = {version="==5.2"}
-"gevent" = {version="==24.2.1"}
+"gevent" = {version="==24.11.1"}
 "gevent-websocket" = {version="==0.10.1"}
 "kthread" = {version="==0.2.3"}
 "gitignore-parser" = {version="==0.1.11"}

diff --git a/tools/packages/pipfiles/Pipfile3.11.max b/tools/packages/pipfiles/Pipfile3.11.max
@@ -50,7 +50,7 @@ version = "==4.2.13"
 
 
 [packages]
-"pyarrow" = {version="==17.0.0"}
+"pyarrow" = {version="==18.0.0"}
 "networkx" = {version="==3.3", markers="python_version>'3.8'"}
 "openpyxl" = {version="==3.1.2"}
 "pandas" = {version="==2.2.2", markers="python_version>'3.8'"}
@@ -59,14 +59,14 @@ version = "==4.2.13"
 "toml" = {version="==0.10.2"}
 "boto3" = {version="==1.34.113"}
 "cookiecutter" = {version="==2.6.0"}
-"flask" = {version="==3.0.3"}
+"flask" = {version="==3.1.0"}
 "flask-cors" = {version="==5.0.0"}
-"flask-socketio" = {version="==5.3.6"}
+"flask-socketio" = {version="==5.4.1"}
 "markdown" = {version="==3.6"}
 "python-dotenv" = {version="==1.0.1"}
 "pytz" = {version="==2024.1"}
 "tzlocal" = {version="==5.2"}
-"gevent" = {version="==24.2.1"}
+"gevent" = {version="==24.11.1"}
 "gevent-websocket" = {version="==0.10.1"}
 "kthread" = {version="==0.2.3"}
 "gitignore-parser" = {version="==0.1.11"}

diff --git a/tools/packages/pipfiles/Pipfile3.12.max b/tools/packages/pipfiles/Pipfile3.12.max
@@ -50,7 +50,7 @@ version = "==4.2.13"
 
 
 [packages]
-"pyarrow" = {version="==17.0.0"}
+"pyarrow" = {version="==18.0.0"}
 "networkx" = {version="==3.3", markers="python_version>'3.8'"}
 "openpyxl" = {version="==3.1.2"}
 "pandas" = {version="==2.2.2", markers="python_version>'3.8'"}
@@ -59,14 +59,14 @@ version = "==4.2.13"
 "toml" = {version="==0.10.2"}
 "boto3" = {version="==1.34.113"}
 "cookiecutter" = {version="==2.6.0"}
-"flask" = {version="==3.0.3"}
+"flask" = {version="==3.1.0"}
 "flask-cors" = {version="==5.0.0"}
-"flask-socketio" = {version="==5.3.6"}
+"flask-socketio" = {version="==5.4.1"}
 "markdown" = {version="==3.6"}
 "python-dotenv" = {version="==1.0.1"}
 "pytz" = {version="==2024.1"}
 "tzlocal" = {version="==5.2"}
-"gevent" = {version="==24.2.1"}
+"gevent" = {version="==24.11.1"}
 "gevent-websocket" = {version="==0.10.1"}
 "kthread" = {version="==0.2.3"}
 "gitignore-parser" = {version="==0.1.11"}

diff --git a/tools/packages/pipfiles/Pipfile3.9.max b/tools/packages/pipfiles/Pipfile3.9.max
@@ -50,7 +50,7 @@ version = "==4.2.13"
 
 
 [packages]
-"pyarrow" = {version="==17.0.0"}
+"pyarrow" = {version="==18.0.0"}
 "networkx" = {version="==3.2.1", markers="python_version>'3.8'"}
 "openpyxl" = {version="==3.1.2"}
 "pandas" = {version="==2.2.2", markers="python_version>'3.8'"}
@@ -59,14 +59,14 @@ version = "==4.2.13"
 "toml" = {version="==0.10.2"}
 "boto3" = {version="==1.34.113"}
 "cookiecutter" = {version="==2.6.0"}
-"flask" = {version="==3.0.3"}
+"flask" = {version="==3.1.0"}
 "flask-cors" = {version="==5.0.0"}
-"flask-socketio" = {version="==5.3.6"}
+"flask-socketio" = {version="==5.4.1"}
 "markdown" = {version="==3.6"}
 "python-dotenv" = {version="==1.0.1"}
 "pytz" = {version="==2024.1"}
 "tzlocal" = {version="==5.2"}
-"gevent" = {version="==24.2.1"}
+"gevent" = {version="==24.11.1"}
 "gevent-websocket" = {version="==0.10.1"}
 "kthread" = {version="==0.2.3"}
 "gitignore-parser" = {version="==0.1.11"}

diff --git a/tools/packages/taipy-core/setup.requirements.txt b/tools/packages/taipy-core/setup.requirements.txt
@@ -2,7 +2,7 @@ boto3>=1.29.4,<=1.34.113
 networkx>=2.6,<=3.3
 openpyxl>=3.1.2,<=3.1.2
 pandas>=1.3.5,<=2.2.2
-pyarrow>=17.0.0,<=17.9.9
+pyarrow>=16.0.0,<19.0
 pymongo[srv]>=4.2.0,<=4.7.2
 sqlalchemy>=2.0.16,<=2.0.30
 taipy-common

diff --git a/tools/packages/taipy-gui/setup.py b/tools/packages/taipy-gui/setup.py
@@ -44,7 +44,7 @@
         "python-magic>=0.4.24,<0.5;platform_system!='Windows'",
         "python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
     ],
-    "arrow": ["pyarrow>=17.0.0,<18.0"],
+    "arrow": ["pyarrow>=16.0.0,<19.0"],
 }
 
 

diff --git a/tools/packages/taipy-gui/setup.requirements.txt b/tools/packages/taipy-gui/setup.requirements.txt
@@ -1,8 +1,8 @@
 charset-normalizer>=3.3.2,<=3.3.2
-flask>=3.0.0,<=3.0.3
+flask>=3.1.0,<3.2
 flask-cors>=5.0.0,<5.1
-flask-socketio>=5.3.6,<=5.3.6
-gevent>=23.7.0,<=24.2.1
+flask-socketio>=5.4.1,<5.5
+gevent>=24.11.1,<24.12
 gevent-websocket>=0.10.1,<=0.10.1
 gitignore-parser>=0.1,<=0.1.11
 kthread>=0.2.3,<=0.2.3

diff --git a/tools/packages/taipy-rest/setup.requirements.txt b/tools/packages/taipy-rest/setup.requirements.txt
@@ -1,6 +1,6 @@
 apispec[yaml]>=6.3,<=6.6.1
 apispec-webframeworks>=0.5.2,<=1.1.0
-flask>=3.0.0,<=3.0.3
+flask>=3.1.0,<3.2
 flask-restful>=0.3.9,<=0.3.10
 marshmallow>=3.20.1,<=3.21.2
 passlib>=1.7.4,<=1.7.4

diff --git a/tools/packages/taipy/setup.py b/tools/packages/taipy/setup.py
@@ -56,7 +56,7 @@ def run(self):
             "python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
         ],
         "rdp": ["rdp>=0.8"],
-        "arrow": ["pyarrow>=17.0.0,<18.0"],
+        "arrow": ["pyarrow>=16.0.0,<19.0"],
         "mssql": ["pyodbc>=4"],
     },
     cmdclass={"build_py": NPMInstall},