diff --git a/.github/workflows/build-and-release-dev.yml b/.github/workflows/build-and-release-dev.yml index 9cc11a7cff..171e099df5 100644 --- a/.github/workflows/build-and-release-dev.yml +++ b/.github/workflows/build-and-release-dev.yml @@ -110,11 +110,15 @@ jobs: run: | cp tools/gui/generate_pyi.py pyi_temp.py && pipenv run python pyi_temp.py && rm pyi_temp.py + - name: Build frontends + if: matrix.package == 'gui' + run: | + python tools/frontend/bundle_build.py + - name: Build Package Structure working-directory: ${{ steps.set-variables.outputs.package_dir }} run: | python tools/release/build_package_structure.py ${{ matrix.package }} - ls -lah - name: Build package working-directory: ${{ steps.set-variables.outputs.package_dir }} @@ -138,8 +142,6 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 build-and-release-taipy-dev: - permissions: - id-token: write # IMPORTANT: this permission is mandatory for trusted publishing runs-on: ubuntu-latest needs: [ build-and-release-taipy-dev-packages, fetch-versions ] timeout-minutes: 20 diff --git a/taipy/gui/MANIFEST.in b/taipy/gui/MANIFEST.in index b55c64a825..8bed1ec99f 100644 --- a/taipy/gui/MANIFEST.in +++ b/taipy/gui/MANIFEST.in @@ -1,7 +1,7 @@ recursive-include tools * # Package taipy-gui -recursive-include webapp * +recursive-include taipy-gui/webapp * include version.json include viselements.json include *.pyi diff --git a/tools/gui/generate_pyi.py b/tools/gui/generate_pyi.py index ec9d6c0a8d..c7eab57d00 100644 --- a/tools/gui/generate_pyi.py +++ b/tools/gui/generate_pyi.py @@ -38,9 +38,9 @@ with open(gui_pyi_file, "r") as file: for line in file: if "def run(" in line: - line = line.replace( - ", run_server: bool = ..., run_in_thread: bool = ..., async_mode: str = ..., **kwargs", gui_config - ) + replace_str = line[line.index(", run_server") : (line.index("**kwargs") + len("**kwargs"))] + # ", run_server: bool = ..., run_in_thread: bool = ..., async_mode: str = ..., **kwargs" + line = line.replace(replace_str, gui_config) replaced_content = replaced_content + line with open(gui_pyi_file, "w") as write_file: diff --git a/tools/release/build_package_structure.py b/tools/release/build_package_structure.py index fbe0960433..66efd5d26b 100644 --- a/tools/release/build_package_structure.py +++ b/tools/release/build_package_structure.py @@ -27,8 +27,3 @@ if file_name.lower().endswith((".md", ".json")) or file_name in __SKIP: continue shutil.move(file_name, _package_path) - - for file_name in os.listdir("../"): - if os.path.isdir(file_name): - continue - shutil.move(file_name, ".")