From 630722a52403c151e3ba4383c92b9c8b5eb5336d Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Thu, 3 Jun 2021 16:02:59 +0200 Subject: [PATCH] use poetry to build openpype wheel --- pyproject.toml | 18 ++++++++++++++++++ setup.py | 4 +++- tools/build_dependencies.py | 16 ++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7ba869e50e..db805e989b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,23 @@ documentation = "https://openpype.io/docs/artist_getting_started" repository = "https://github.com/pypeclub/openpype" readme = "README.md" keywords = ["Pipeline", "Avalon", "VFX", "animation", "automation", "tracking", "asset management"] +packages = [ + {include = "igniter"}, + {include = "repos"}, + {include = "tools"}, + {include = "tests"}, + {include = "docs"}, + {include = "openpype"}, + {include = "start.py"}, + {include = "LICENSE"}, + {include = "README.md"}, + {include = "setup.py"}, + {include = "pyproject.toml"}, + {include = "poetry.lock"} +] + +[tool.poetry.scripts] +openpype = 'start:boot' [tool.poetry.dependencies] python = "3.7.*" @@ -66,6 +83,7 @@ sphinx-qt-documentation = "*" recommonmark = "*" wheel = "*" enlighten = "*" # cool terminal progress bars +aenum = "^3.1.0" # cross-python compatible Enum, used in representations [tool.poetry.urls] "Bug Tracker" = "https://github.com/pypeclub/openpype/issues" diff --git a/setup.py b/setup.py index 5fb0b33f2a..927dd28afd 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,9 @@ install_requires = [ ] includes = [] -excludes = [] +excludes = [ + "openpype" +] bin_includes = [] include_files = [ "igniter", diff --git a/tools/build_dependencies.py b/tools/build_dependencies.py index de3b6da021..3898450471 100644 --- a/tools/build_dependencies.py +++ b/tools/build_dependencies.py @@ -120,7 +120,7 @@ _print("Copying dependencies ...") total_files = count_folders(site_pkg) progress_bar = enlighten.Counter( total=total_files, desc="Processing Dependencies", - units="%", color="green") + units="%", color=(53, 178, 202)) def _progress(_base, _names): @@ -140,7 +140,8 @@ to_delete = [] deps_items = list(deps_dir.iterdir()) item_count = len(list(libs_dir.iterdir())) find_progress_bar = enlighten.Counter( - total=item_count, desc="Finding duplicates", units="%", color="yellow") + total=item_count, desc="Finding duplicates", units="%", + color=(56, 211, 159)) for d in libs_dir.iterdir(): if (deps_dir / d.name) in deps_items: @@ -152,16 +153,23 @@ find_progress_bar.close() # add openpype and igniter in libs too to_delete.append(libs_dir / "openpype") to_delete.append(libs_dir / "igniter") +to_delete.append(libs_dir / "openpype.pth") +to_delete.append(deps_dir / "openpype.pth") # delete duplicates # _print(f"Deleting {len(to_delete)} duplicates ...") delete_progress_bar = enlighten.Counter( - total=len(to_delete), desc="Deleting duplicates", units="%", color="red") + total=len(to_delete), desc="Deleting duplicates", units="%", + color=(251, 192, 32)) for d in to_delete: if d.is_dir(): shutil.rmtree(d) else: - d.unlink() + try: + d.unlink() + except FileNotFoundError: + # skip non-existent silently + pass delete_progress_bar.update() delete_progress_bar.close()