Skip to content

Commit

Permalink
pyarrow update to 17 (#1796)
Browse files Browse the repository at this point in the history
* update pyarrow to 17

* frontend

* clean up

* remove warning in jest

---------

Co-authored-by: Fred Lefévère-Laoide <[email protected]>
  • Loading branch information
FredLL-Avaiga and Fred Lefévère-Laoide authored Sep 17, 2024
1 parent 9b3293e commit aa15cea
Show file tree
Hide file tree
Showing 18 changed files with 152 additions and 152 deletions.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ marshmallow = "==3.20.1"
networkx = "==2.6"
openpyxl = "==3.1.2"
pandas = "==1.3.5"
pyarrow = "==14.0.2"
pyarrow = "*"
pymongo = {extras = ["srv"], version = "==4.6.3"}
python-dotenv = "==1.0.0"
python-magic = {version = "==0.4.24", markers="sys_platform != 'win32'"}
Expand Down
12 changes: 5 additions & 7 deletions frontend/taipy-gui/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* specific language governing permissions and limitations under the License.
*/

const { createJsWithTsPreset } = require('ts-jest')


/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
module.exports = {
// testEnvironment: 'jest-environment-jsdom',
// preset: "ts-jest",
preset: "ts-jest/presets/js-with-ts",
testEnvironment: "jsdom",
setupFiles: [
"./test-config/jest.env.js",
Expand All @@ -25,9 +25,7 @@ module.exports = {
"./test-config/intersectionObserver.js",
],
coverageReporters: ["json", "html", "text"],
modulePathIgnorePatterns: ["<rootDir>/packaging/"],
transformIgnorePatterns: ["<rootDir>/node_modules/(?!react-jsx-parser/)"],
// transform: {"^.+\.[jt]sx?$": "ts-jest"},
// moduleNameMapper: {
// "^react-jsx-parser": require.resolve("react-jsx-parser"),
// },
...createJsWithTsPreset()
};
259 changes: 130 additions & 129 deletions frontend/taipy-gui/package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion frontend/taipy-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@mui/material": "^6.0.1",
"@mui/x-date-pickers": "^7.0.0",
"@mui/x-tree-view": "^7.0.0",
"apache-arrow": "^14.0.2",
"apache-arrow": "^17.0.0",
"axios": "^1.2.0",
"date-fns": "^3.6.0",
"date-fns-tz": "^3.1.3",
Expand Down Expand Up @@ -115,6 +115,7 @@
"mock-socket": "^9.0.7",
"mock-xmlhttprequest": "^8.2.0",
"ts-jest": "^29.0.0",
"ts-jest-mock-import-meta": "^1.2.0",
"ts-loader": "^9.2.6",
"typedoc": "^0.26.3",
"typedoc-plugin-markdown": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ image = [
"python-magic-bin>=0.4.14,<0.5",
]
rdp = ["rdp>=0.8"]
arrow = ["pyarrow>=14.0.2,<15.0"]
arrow = ["pyarrow>=17.0.0,<18.0"]
mssql = ["pyodbc>=4"]

[project.scripts]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def run(self):
"python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
],
"rdp": ["rdp>=0.8"],
"arrow": ["pyarrow>=14.0.2,<15.0"],
"arrow": ["pyarrow>=17.0.0,<18.0"],
"mssql": ["pyodbc>=4"],
},
cmdclass={"build_py": NPMInstall},
Expand Down
2 changes: 1 addition & 1 deletion taipy/core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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>=14.0.2,<15.0"]
parquet = ["fastparquet==2022.11.0", "pyarrow>=17.0.0,<18.0"]
s3 = ["boto3==1.29.1"]
mongo = ["pymongo[srv]>=4.2.0,<5.0"]

Expand Down
2 changes: 1 addition & 1 deletion taipy/core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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>=14.0.2,<15.0"],
"parquet": ["fastparquet==2022.11.0", "pyarrow>=17.0.0,<18.0"],
"s3": ["boto3==1.29.1"],
"mongo": ["pymongo[srv]>=4.2.0,<5.0"],
}
Expand Down
2 changes: 1 addition & 1 deletion taipy/gui/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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>=14.0.2,<15.0"]
arrow = ["pyarrow>=17.0.0,<18.0"]

[tool.setuptools.packages]
find = {include = ["taipy", "taipy.gui", "taipy.gui.*"]}
Expand Down
2 changes: 1 addition & 1 deletion taipy/gui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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>=14.0.2,<15.0"],
"arrow": ["pyarrow>=17.0.0,<18.0"],
}

def _build_webapp():
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/pipfiles/Pipfile3.10.max
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ version = "==4.2.13"


[packages]
"pyarrow" = {version="==16.1.0"}
"pyarrow" = {version="==17.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'"}
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/pipfiles/Pipfile3.11.max
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ version = "==4.2.13"


[packages]
"pyarrow" = {version="==16.1.0"}
"pyarrow" = {version="==17.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'"}
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/pipfiles/Pipfile3.12.max
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ version = "==4.2.13"


[packages]
"pyarrow" = {version="==16.1.0"}
"pyarrow" = {version="==17.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'"}
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/pipfiles/Pipfile3.8.max
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ version = "==4.2.13"


[packages]
"pyarrow" = {version="==16.1.0"}
"pyarrow" = {version="==17.0.0"}
"networkx" = {version="==3.1", markers="python_version<'3.9'"}
"openpyxl" = {version="==3.1.2"}
"pandas" = {version="==2.0.3", markers="python_version<'3.9'"}
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/pipfiles/Pipfile3.9.max
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ version = "==4.2.13"


[packages]
"pyarrow" = {version="==16.1.0"}
"pyarrow" = {version="==17.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'"}
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/taipy-core/setup.requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>=14.0.2,<=16.1.0
pyarrow>=17.0.0,<=17.9.9
pymongo[srv]>=4.2.0,<=4.7.2
sqlalchemy>=2.0.16,<=2.0.30
taipy-config
Expand Down
2 changes: 1 addition & 1 deletion tools/packages/taipy-gui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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>=14.0.2,<15.0"],
"arrow": ["pyarrow>=17.0.0,<18.0"],
}


Expand Down
2 changes: 1 addition & 1 deletion tools/packages/taipy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def run(self):
"python-magic-bin>=0.4.14,<0.5;platform_system=='Windows'",
],
"rdp": ["rdp>=0.8"],
"arrow": ["pyarrow>=14.0.2,<15.0"],
"arrow": ["pyarrow>=17.0.0,<18.0"],
"mssql": ["pyodbc>=4"],
},
cmdclass={"build_py": NPMInstall},
Expand Down

0 comments on commit aa15cea

Please sign in to comment.