diff --git a/.github/workflows/build-and-release-dev.yml b/.github/workflows/build-and-release-dev.yml index c346c3ea83..976a846c40 100644 --- a/.github/workflows/build-and-release-dev.yml +++ b/.github/workflows/build-and-release-dev.yml @@ -91,10 +91,6 @@ jobs: ${{needs.fetch-versions.outputs.templates_VERSION}} \ ${{ github.event.inputs.publish_on_pypi }} - - name: Copy tools - run: | - cp -r tools ${{ steps.set-variables.outputs.package_dir }} - - name: Install dependencies run: | python -m pip install --upgrade pip @@ -103,7 +99,7 @@ jobs: - name: Install GUI dependencies if: matrix.package == 'gui' run: | - pipenv install --dev --verbose + pipenv install --dev - name: Generate GUI pyi file if: matrix.package == 'gui' diff --git a/taipy/config/MANIFEST.in b/taipy/config/MANIFEST.in new file mode 100644 index 0000000000..4f0d177566 --- /dev/null +++ b/taipy/config/MANIFEST.in @@ -0,0 +1,5 @@ +recursive-include tools * + +# Package taipy-config +include *.pyi +include *.json diff --git a/taipy/core/MANIFEST.in b/taipy/core/MANIFEST.in new file mode 100644 index 0000000000..89d019e4ae --- /dev/null +++ b/taipy/core/MANIFEST.in @@ -0,0 +1,4 @@ +recursive-include tools * + +# Package taipy-core +include *.json diff --git a/taipy/core/setup.py b/taipy/core/setup.py index 59417f9d59..1c2f2937d5 100644 --- a/taipy/core/setup.py +++ b/taipy/core/setup.py @@ -36,6 +36,8 @@ def get_requirements(): # get requirements from the different setups in tools/packages (removing taipy packages) reqs = set() for pkg in (root_folder / "tools" / "packages").iterdir(): + if "taipy-core" not in pkg: + continue requirements_file = pkg / "setup.requirements.txt" if requirements_file.exists(): reqs.update(requirements_file.read_text("UTF-8").splitlines()) diff --git a/taipy/gui/MANIFEST.in b/taipy/gui/MANIFEST.in index 20c55dbbba..b55c64a825 100644 --- a/taipy/gui/MANIFEST.in +++ b/taipy/gui/MANIFEST.in @@ -1,3 +1,5 @@ +recursive-include tools * + # Package taipy-gui recursive-include webapp * include version.json diff --git a/taipy/gui/setup.py b/taipy/gui/setup.py index fafe102442..14c7f02767 100644 --- a/taipy/gui/setup.py +++ b/taipy/gui/setup.py @@ -38,6 +38,8 @@ def get_requirements(): # get requirements from the different setups in tools/packages (removing taipy packages) reqs = set() for pkg in (root_folder / "tools" / "packages").iterdir(): + if "taipy-gui" not in pkg: + continue requirements_file = pkg / "setup.requirements.txt" if requirements_file.exists(): reqs.update(requirements_file.read_text("UTF-8").splitlines()) diff --git a/taipy/rest/MANIFEST.in b/taipy/rest/MANIFEST.in new file mode 100644 index 0000000000..7901db8f8a --- /dev/null +++ b/taipy/rest/MANIFEST.in @@ -0,0 +1,4 @@ +recursive-include tools * + +# Package taipy-rest +include *.json diff --git a/taipy/rest/setup.py b/taipy/rest/setup.py index db21540dbd..255b11b65e 100644 --- a/taipy/rest/setup.py +++ b/taipy/rest/setup.py @@ -31,6 +31,8 @@ def get_requirements(): # get requirements from the different setups in tools/packages (removing taipy packages) reqs = set() for pkg in (root_folder / "tools" / "packages").iterdir(): + if "taipy-rest" not in pkg: + continue requirements_file = pkg / "setup.requirements.txt" if requirements_file.exists(): reqs.update(requirements_file.read_text("UTF-8").splitlines()) diff --git a/taipy/templates/MANIFEST.in b/taipy/templates/MANIFEST.in new file mode 100644 index 0000000000..6d1947573e --- /dev/null +++ b/taipy/templates/MANIFEST.in @@ -0,0 +1,4 @@ +recursive-include tools * + +# Package taipy-templates +recursive-include .