From 8830cabee6c166694fc40a7ec0606e64165d66fb Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Sun, 28 Jul 2024 11:02:44 -0500 Subject: [PATCH 1/6] sync remote --- demo-project/.version | 0 src/components/export-modal/export-modal.js | 0 src/components/flowchart/flowchart.js | 0 src/components/flowchart/styles/_layers.scss | 0 src/components/global-toolbar/global-toolbar.js | 0 src/components/ui/button/button.js | 0 src/components/ui/dropdown/dropdown.js | 0 src/components/update-reminder/update-reminder-content.js | 0 src/config.js | 0 src/store/initial-state.js | 0 tools/test-lib/react-app/app.js | 0 11 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 demo-project/.version mode change 100644 => 100755 src/components/export-modal/export-modal.js mode change 100644 => 100755 src/components/flowchart/flowchart.js mode change 100644 => 100755 src/components/flowchart/styles/_layers.scss mode change 100644 => 100755 src/components/global-toolbar/global-toolbar.js mode change 100644 => 100755 src/components/ui/button/button.js mode change 100644 => 100755 src/components/ui/dropdown/dropdown.js mode change 100644 => 100755 src/components/update-reminder/update-reminder-content.js mode change 100644 => 100755 src/config.js mode change 100644 => 100755 src/store/initial-state.js mode change 100644 => 100755 tools/test-lib/react-app/app.js diff --git a/demo-project/.version b/demo-project/.version old mode 100644 new mode 100755 diff --git a/src/components/export-modal/export-modal.js b/src/components/export-modal/export-modal.js old mode 100644 new mode 100755 diff --git a/src/components/flowchart/flowchart.js b/src/components/flowchart/flowchart.js old mode 100644 new mode 100755 diff --git a/src/components/flowchart/styles/_layers.scss b/src/components/flowchart/styles/_layers.scss old mode 100644 new mode 100755 diff --git a/src/components/global-toolbar/global-toolbar.js b/src/components/global-toolbar/global-toolbar.js old mode 100644 new mode 100755 diff --git a/src/components/ui/button/button.js b/src/components/ui/button/button.js old mode 100644 new mode 100755 diff --git a/src/components/ui/dropdown/dropdown.js b/src/components/ui/dropdown/dropdown.js old mode 100644 new mode 100755 diff --git a/src/components/update-reminder/update-reminder-content.js b/src/components/update-reminder/update-reminder-content.js old mode 100644 new mode 100755 diff --git a/src/config.js b/src/config.js old mode 100644 new mode 100755 diff --git a/src/store/initial-state.js b/src/store/initial-state.js old mode 100644 new mode 100755 diff --git a/tools/test-lib/react-app/app.js b/tools/test-lib/react-app/app.js old mode 100644 new mode 100755 From a30d0e4d2c1caf9114349fe98bf673345daa7d6b Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Thu, 14 Nov 2024 22:50:18 -0600 Subject: [PATCH 2/6] add python 3.12 support --- .github/workflows/all-checks.yml | 6 +++--- .github/workflows/build-backend.yml | 6 +++--- .github/workflows/docs-only-checks.yml | 2 +- RELEASE.md | 1 + package/features/environment.py | 2 +- package/kedro_viz/__init__.py | 2 +- package/tests/test_import.py | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/all-checks.yml b/.github/workflows/all-checks.yml index 4c981d6c8b..694097a9e6 100644 --- a/.github/workflows/all-checks.yml +++ b/.github/workflows/all-checks.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/e2e-tests.yml with: os: ${{ matrix.os }} @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/unit-tests.yml with: os: ${{ matrix.os }} @@ -34,7 +34,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/lint.yml with: os: ${{ matrix.os }} diff --git a/.github/workflows/build-backend.yml b/.github/workflows/build-backend.yml index 70a8691854..970d574c4b 100644 --- a/.github/workflows/build-backend.yml +++ b/.github/workflows/build-backend.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/e2e-tests.yml with: os: ${{ matrix.os }} @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/unit-tests.yml with: os: ${{ matrix.os }} @@ -37,7 +37,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/lint.yml with: os: ${{ matrix.os }} diff --git a/.github/workflows/docs-only-checks.yml b/.github/workflows/docs-only-checks.yml index bd09e387e8..361df04c3b 100644 --- a/.github/workflows/docs-only-checks.yml +++ b/.github/workflows/docs-only-checks.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12" ] uses: ./.github/workflows/lint.yml with: os: ${{ matrix.os }} diff --git a/RELEASE.md b/RELEASE.md index 61cb49bf9b..129091b795 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,6 +10,7 @@ Please follow the established format: ## Major features and improvements +- Add support for Python 3.12 - Update Kedro-Viz telemetry for opt-out model (#2022) - Introduce `behaviour` prop object with `reFocus` prop (#2161) diff --git a/package/features/environment.py b/package/features/environment.py index 38fb8e0e61..73c75f26b3 100644 --- a/package/features/environment.py +++ b/package/features/environment.py @@ -41,7 +41,7 @@ def before_scenario(context, scenario): if ( kedro_version - and kedro_version <= parse("0.18.12") + and kedro_version < parse("0.18.12") and sys.version_info >= (3, 11) ): print( diff --git a/package/kedro_viz/__init__.py b/package/kedro_viz/__init__.py index 806f783d93..d19e2fb8e7 100644 --- a/package/kedro_viz/__init__.py +++ b/package/kedro_viz/__init__.py @@ -10,7 +10,7 @@ class KedroVizPythonVersionWarning(UserWarning): """Custom class for warnings about incompatibilities with Python versions.""" -if sys.version_info >= (3, 12): +if sys.version_info >= (3, 13): warnings.warn( """Please be advised that Kedro Viz is not yet fully compatible with the Python version you are currently using.""", diff --git a/package/tests/test_import.py b/package/tests/test_import.py index e9e918c6c1..2198ccdcc4 100644 --- a/package/tests/test_import.py +++ b/package/tests/test_import.py @@ -4,8 +4,8 @@ def test_import_kedro_viz_with_no_official_support_emits_warning(mocker): - """Test importing kedro Viz with python>=3.12 and controlled warnings should work""" - mocker.patch("kedro_viz.sys.version_info", (3, 12)) + """Test importing kedro Viz with python>=3.13 and controlled warnings should work""" + mocker.patch("kedro_viz.sys.version_info", (3, 13)) # We use the parent class to avoid issues with `exec_module` with pytest.warns(UserWarning) as record: From 662da863c020da33949c4959f88ed859fdff458c Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Thu, 14 Nov 2024 22:51:28 -0600 Subject: [PATCH 3/6] fix permission --- demo-project/.version | 0 src/components/export-modal/export-modal.js | 0 src/components/flowchart/flowchart.js | 0 src/components/flowchart/styles/_layers.scss | 0 src/components/global-toolbar/global-toolbar.js | 0 src/components/ui/button/button.js | 0 src/components/ui/dropdown/dropdown.js | 0 src/components/update-reminder/update-reminder-content.js | 0 src/config.js | 0 src/store/initial-state.js | 0 tools/test-lib/react-app/app.js | 0 11 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 demo-project/.version mode change 100755 => 100644 src/components/export-modal/export-modal.js mode change 100755 => 100644 src/components/flowchart/flowchart.js mode change 100755 => 100644 src/components/flowchart/styles/_layers.scss mode change 100755 => 100644 src/components/global-toolbar/global-toolbar.js mode change 100755 => 100644 src/components/ui/button/button.js mode change 100755 => 100644 src/components/ui/dropdown/dropdown.js mode change 100755 => 100644 src/components/update-reminder/update-reminder-content.js mode change 100755 => 100644 src/config.js mode change 100755 => 100644 src/store/initial-state.js mode change 100755 => 100644 tools/test-lib/react-app/app.js diff --git a/demo-project/.version b/demo-project/.version old mode 100755 new mode 100644 diff --git a/src/components/export-modal/export-modal.js b/src/components/export-modal/export-modal.js old mode 100755 new mode 100644 diff --git a/src/components/flowchart/flowchart.js b/src/components/flowchart/flowchart.js old mode 100755 new mode 100644 diff --git a/src/components/flowchart/styles/_layers.scss b/src/components/flowchart/styles/_layers.scss old mode 100755 new mode 100644 diff --git a/src/components/global-toolbar/global-toolbar.js b/src/components/global-toolbar/global-toolbar.js old mode 100755 new mode 100644 diff --git a/src/components/ui/button/button.js b/src/components/ui/button/button.js old mode 100755 new mode 100644 diff --git a/src/components/ui/dropdown/dropdown.js b/src/components/ui/dropdown/dropdown.js old mode 100755 new mode 100644 diff --git a/src/components/update-reminder/update-reminder-content.js b/src/components/update-reminder/update-reminder-content.js old mode 100755 new mode 100644 diff --git a/src/config.js b/src/config.js old mode 100755 new mode 100644 diff --git a/src/store/initial-state.js b/src/store/initial-state.js old mode 100755 new mode 100644 diff --git a/tools/test-lib/react-app/app.js b/tools/test-lib/react-app/app.js old mode 100755 new mode 100644 From 68ee45aa6f9534e6a30e8a76af463d8b62349b15 Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Sun, 17 Nov 2024 19:46:19 -0600 Subject: [PATCH 4/6] testing windows build --- .github/workflows/e2e-tests.yml | 3 ++- .github/workflows/unit-tests.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 5eee3d98cd..b6688a1310 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -20,7 +20,8 @@ jobs: ( ( github.ref == 'refs/heads/main' || - github.ref == 'refs/heads/demo' + github.ref == 'refs/heads/demo' || + github.ref == 'refs/heads/feature/python-3-12' ) && inputs.os == 'windows-latest' ) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index fe970683c3..0ee5ccedb7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -20,7 +20,8 @@ jobs: ( ( github.ref == 'refs/heads/main' || - github.ref == 'refs/heads/demo' + github.ref == 'refs/heads/demo' || + github.ref == 'refs/heads/feature/python-3-12' ) && inputs.os == 'windows-latest' ) From 51103c9865c97cd2b8ea9b0a022479c8ee0912bb Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Sun, 17 Nov 2024 23:46:11 -0600 Subject: [PATCH 5/6] testing py3.12 with upgraded pandas --- .github/workflows/e2e-tests.yml | 10 ---------- .github/workflows/unit-tests.yml | 10 ---------- package/features/steps/lower_requirements.txt | 3 ++- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index b6688a1310..e6e862c0a2 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -15,16 +15,6 @@ jobs: # below condition checks if the operating system is Ubuntu, or # if the operating system is Windows and the branch is main/demo - if: > - inputs.os == 'ubuntu-latest' || - ( - ( - github.ref == 'refs/heads/main' || - github.ref == 'refs/heads/demo' || - github.ref == 'refs/heads/feature/python-3-12' - ) && - inputs.os == 'windows-latest' - ) steps: - name: Checkout code diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 0ee5ccedb7..78d43097c4 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -15,16 +15,6 @@ jobs: # below condition checks if the operating system is Ubuntu, or # if the operating system is Windows and the branch is main/demo - if: > - inputs.os == 'ubuntu-latest' || - ( - ( - github.ref == 'refs/heads/main' || - github.ref == 'refs/heads/demo' || - github.ref == 'refs/heads/feature/python-3-12' - ) && - inputs.os == 'windows-latest' - ) steps: - name: Checkout code diff --git a/package/features/steps/lower_requirements.txt b/package/features/steps/lower_requirements.txt index ab38585acf..66dff33f1c 100644 --- a/package/features/steps/lower_requirements.txt +++ b/package/features/steps/lower_requirements.txt @@ -7,7 +7,8 @@ watchfiles==0.24.0 plotly==4.8 packaging==23.0 pandas==1.3; python_version < '3.10' -pandas==1.5; python_version >= '3.10' +pandas==1.5; python_version >= '3.10' and python_version < '3.12' +pandas==2.1.1; python_version >= '3.12' sqlalchemy==1.4 strawberry-graphql==0.192.0 networkx==2.5 From f9f66007f9f540da69946144e2dbdf580b5c9bb5 Mon Sep 17 00:00:00 2001 From: ravi-kumar-pilla Date: Mon, 18 Nov 2024 00:50:38 -0600 Subject: [PATCH 6/6] testing python 3.12 and fsspec compat --- package/features/steps/lower_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/features/steps/lower_requirements.txt b/package/features/steps/lower_requirements.txt index 66dff33f1c..70139190ef 100644 --- a/package/features/steps/lower_requirements.txt +++ b/package/features/steps/lower_requirements.txt @@ -1,6 +1,6 @@ ipython==7.0.0 fastapi==0.100.0 -fsspec==2021.4 +fsspec==2021.06.01 aiofiles==22.1.0 uvicorn[standard]==0.22.0 watchfiles==0.24.0