Skip to content

Commit

Permalink
fix: build subpackage structure
Browse files Browse the repository at this point in the history
  • Loading branch information
joaoandre-avaiga committed Mar 1, 2024
1 parent 7559913 commit 6eaa585
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build-and-release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ jobs:
run: |
cp tools/gui/generate_pyi.py pyi_temp.py && pipenv run python pyi_temp.py && rm pyi_temp.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 }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion taipy/core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ 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:
if "taipy-core" not in str(pkg):
continue
requirements_file = pkg / "setup.requirements.txt"
if requirements_file.exists():
Expand Down
2 changes: 1 addition & 1 deletion taipy/gui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ 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:
if "taipy-gui" not in str(pkg):
continue
requirements_file = pkg / "setup.requirements.txt"
if requirements_file.exists():
Expand Down
2 changes: 1 addition & 1 deletion taipy/rest/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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:
if "taipy-rest" not in str(pkg):
continue
requirements_file = pkg / "setup.requirements.txt"
if requirements_file.exists():
Expand Down
29 changes: 29 additions & 0 deletions tools/release/build_package_structure.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright 2021-2024 Avaiga Private Limited
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.

import os
import shutil
import sys
from pathlib import Path

__SKIP = ["LICENSE", "MANIFEST.in", "taipy", "setup.py", "tools"]


if __name__ == "__main__":
_package = sys.argv[1]
_package_path = f"taipy/{_package}"

Path(_package_path).mkdir(parents=True, exist_ok=True)

for file_name in os.listdir("."):
if file_name.lower().endswith((".md", ".json")) or file_name in __SKIP:
continue
shutil.move(file_name, _package_path)

0 comments on commit 6eaa585

Please sign in to comment.