Merge pull request #1721 from Avaiga/fix/release

Fix release action
Avaiga · Aug 29, 2024 · d6a2df0 · d6a2df0
2 parents 1bc8828 + 76dd8b8
commit d6a2df0
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 29 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -171,7 +171,7 @@ jobs:
 
   build-and-release-taipy:
     runs-on: ubuntu-latest
-    needs: [build-and-release-taipy-packages, fetch-versions ]
+    needs: [build-and-release-taipy-packages, fetch-versions]
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
@@ -212,6 +212,10 @@ jobs:
         run: |
           cp -r tools/packages/taipy/. .
 
+      - name: Build Frontend
+        run: |
+          python tools/frontend/bundle_build.py
+
       - name: Build Taipy package
         run: |
           python -m build

diff --git a/taipy/config/pyproject.toml b/taipy/config/pyproject.toml
@@ -31,6 +31,3 @@ find = {include = ["taipy", "taipy.config", "taipy.config.*", "taipy.logger", "t
 
 [project.urls]
 homepage = "https://github.com/avaiga/taipy"
-
-[tool.setuptools.data-files]
-"version" = ["version.json"]
diff --git a/taipy/config/version.json b/taipy/config/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/taipy/core/pyproject.toml b/taipy/core/pyproject.toml
@@ -36,6 +36,3 @@ find = {include = ["taipy", "taipy.core", "taipy.core.*"]}
 
 [project.urls]
 homepage = "https://github.com/avaiga/taipy"
-
-[tool.setuptools.data-files]
-"version" = ["version.json"]
diff --git a/taipy/core/version.json b/taipy/core/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/taipy/gui/pyproject.toml b/taipy/gui/pyproject.toml
@@ -36,6 +36,3 @@ find = {include = ["taipy", "taipy.gui", "taipy.gui.*"]}
 
 [project.urls]
 homepage = "https://github.com/avaiga/taipy"
-
-[tool.setuptools.data-files]
-"version" = ["version.json"]
diff --git a/taipy/gui/version.json b/taipy/gui/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/taipy/rest/pyproject.toml b/taipy/rest/pyproject.toml
@@ -28,6 +28,3 @@ find = {include = ["taipy", "taipy.rest"]}
 
 [project.urls]
 homepage = "https://github.com/avaiga/taipy"
-
-[tool.setuptools.data-files]
-"version" = ["version.json"]
diff --git a/taipy/rest/version.json b/taipy/rest/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/taipy/templates/pyproject.toml b/taipy/templates/pyproject.toml
@@ -28,6 +28,3 @@ find = {include = ["taipy"]}
 
 [project.urls]
 homepage = "https://github.com/avaiga/taipy"
-
-[tool.setuptools.data-files]
-"version" = ["version.json"]
diff --git a/taipy/templates/version.json b/taipy/templates/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/taipy/version.json b/taipy/version.json
@@ -1 +1 @@
-{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
+{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}
diff --git a/tools/packages/taipy-config/setup.py b/tools/packages/taipy-config/setup.py
@@ -43,6 +43,6 @@
         ]
     ),
     include_package_data=True,
-    data_files=[('version', ['version.json'])],
+    data_files=[('version', [version_path])],
     tests_require=test_requirements,
 )
diff --git a/tools/packages/taipy-core/setup.py b/tools/packages/taipy-core/setup.py
@@ -46,7 +46,7 @@
     install_requires=requirements,
     packages=find_packages(where=root_folder, include=["taipy", "taipy.core", "taipy.core.*"]),
     include_package_data=True,
-    data_files=[('version', ['version.json'])],
+    data_files=[('version', [version_path])],
     tests_require=test_requirements,
     extras_require=extras_require,
 )
diff --git a/tools/packages/taipy-gui/setup.py b/tools/packages/taipy-gui/setup.py
@@ -24,7 +24,7 @@
 
 package_desc = Path(root_folder / "package_desc.md").read_text("UTF-8")
 
-version_path = os.path.join(root_folder, "taipy/gui/version.json")
+version_path = "taipy/gui/version.json"
 
 setup_requirements = Path("taipy/gui/setup.requirements.txt")
 
@@ -76,7 +76,7 @@ def run(self):
     install_requires=requirements,
     packages=find_packages(where=root_folder, include=["taipy", "taipy.gui", "taipy.gui.*"]),
     include_package_data=True,
-    data_files=[("version", ["version.json"])],
+    data_files=[("version", [version_path])],
     tests_require=test_requirements,
     extras_require=extras_require,
     cmdclass={"build_py": NPMInstall},

diff --git a/tools/packages/taipy-rest/setup.py b/tools/packages/taipy-rest/setup.py
@@ -36,6 +36,6 @@
     version=version_string,
     packages=find_packages(where=root_folder, include=["taipy", "taipy.rest", "taipy.rest.*"]),
     include_package_data=True,
-    data_files=[('version', ['version.json'])],
+    data_files=[('version', [version_path])],
     install_requires=requirements,
 )
diff --git a/tools/packages/taipy-templates/setup.py b/tools/packages/taipy-templates/setup.py
@@ -37,7 +37,7 @@
 setup(
     packages=find_packages(where=root_folder, include=["taipy"]),
     include_package_data=True,
-    data_files=[('version', ['version.json'])],
+    data_files=[('version', [version_path])],
     test_suite="tests",
     version=version_string,
 )
diff --git a/tools/release/build_package_structure.py b/tools/release/build_package_structure.py
@@ -14,7 +14,7 @@
 import sys
 from pathlib import Path
 
-__SKIP = ["LICENSE", "MANIFEST.in", "taipy", "setup.py", "tools"]
+__SKIP = ["LICENSE", "MANIFEST.in", "taipy", "setup.py", "tools", "pyproject.toml"]
 
 
 if __name__ == "__main__":
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"major": 4, "minor": 0, "patch": 0, "ext": "dev0"}
		{"major": 4, "minor": 0, "patch": 0, "ext": "dev1"}