From 69cafcddda9904b817092d006f70edc097e6a19c Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Thu, 1 Apr 2021 15:02:44 +0200 Subject: [PATCH] pype -> openpype in tools and scripts --- .gitignore | 2 +- poetry.lock | 4 +-- poetry.toml | 2 +- pyproject.toml | 22 +++++++------- setup.cfg | 2 +- setup.py | 20 ++++++------- start.py | 60 ++++++++++++++++++------------------- tools/build.ps1 | 60 ++++++++++++++++++------------------- tools/build.sh | 35 +++++++++++----------- tools/build_dependencies.py | 4 +-- tools/create_env.ps1 | 41 ++++++++++++------------- tools/create_env.sh | 26 ++++++++-------- tools/create_zip.ps1 | 36 +++++++++++----------- tools/create_zip.sh | 27 +++++++++-------- tools/make_docs.ps1 | 28 ++++++++--------- tools/make_docs.sh | 27 ++++++++--------- tools/run_mongo.ps1 | 17 +++++------ tools/run_mongo.sh | 19 ++++++------ tools/run_settings.ps1 | 10 +++---- tools/run_settings.sh | 23 +++++++------- tools/run_tests.ps1 | 45 +++++++++++++--------------- tools/run_tests.sh | 29 +++++++++--------- tools/run_tray.ps1 | 8 ++--- tools/run_tray.sh | 25 ++++++++-------- tools/update_submodules.ps1 | 24 ++++++--------- tools/update_submodules.sh | 14 ++++----- 26 files changed, 289 insertions(+), 321 deletions(-) diff --git a/.gitignore b/.gitignore index 47a37410e6..5dbefa2309 100644 --- a/.gitignore +++ b/.gitignore @@ -69,7 +69,7 @@ coverage.xml node_modules/ package-lock.json -pype/premiere/ppro/js/debug.log +openpype/premiere/ppro/js/debug.log # IDEA diff --git a/poetry.lock b/poetry.lock index e6c08b8ae9..6695a7bcca 100644 --- a/poetry.lock +++ b/poetry.lock @@ -637,8 +637,8 @@ view = ["PySide2 (>=5.11,<6.0)"] [package.source] type = "legacy" -url = "https://d.r1.wbsprt.com/pype.club/distribute" -reference = "pype" +url = "https://distribute.openpype.io/wheels" +reference = "openpype" [[package]] name = "packaging" diff --git a/poetry.toml b/poetry.toml index f05df6491a..19eca443f8 100644 --- a/poetry.toml +++ b/poetry.toml @@ -2,4 +2,4 @@ in-project = true [repositories.pype] -url = "http://d.r1.wbsprt.com/pype.club/distribute/" +url = "https://distribute.openpype.io/wheels/" diff --git a/pyproject.toml b/pyproject.toml index b6ca6574c4..ec2d9c7e3b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ [tool.poetry] -name = "Pype" +name = "OpenPype" version = "3.0.0-alpha1" description = "Multi-platform open-source pipeline built around the Avalon platform, expanding it with extra features and integrations." -authors = ["Pype Club "] +authors = ["OpenPype Team "] license = "MIT License" -homepage = "https://pype.club" -documentation = "https://pype.club/docs/artist_getting_started" -repository = "https://github.com/pypeclub/pype" +homepage = "https://openpype.io" +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"] @@ -15,9 +15,9 @@ python = "3.7.*" aiohttp = "^3.7" aiohttp_json_rpc = "*" # TVPaint server acre = { git = "https://github.com/pypeclub/acre.git" } -opentimelineio = { version = "0.14.0.dev1", source = "pype" } +opentimelineio = { version = "0.14.0.dev1", source = "openpype" } appdirs = "^1.4.3" -blessed = "^1.17" # pype terminal formatting +blessed = "^1.17" # openpype terminal formatting clique = "1.5.*" Click = "^7" dnspython = "^2.1.0" @@ -65,12 +65,12 @@ tqdm = "*" wheel = "*" [tool.poetry.urls] -"Bug Tracker" = "https://github.com/pypeclub/pype/issues" -"Discussions" = "https://github.com/pypeclub/pype/discussions" +"Bug Tracker" = "https://github.com/pypeclub/openpype/issues" +"Discussions" = "https://github.com/pypeclub/openpype/discussions" [[tool.poetry.source]] -name = "pype" -url = "https://d.r1.wbsprt.com/pype.club/distribute/" +name = "openpype" +url = "https://distribute.openpype.io/wheels/" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/setup.cfg b/setup.cfg index bc66f0c4d5..03c999e05f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,4 +25,4 @@ omit = /tests directory = ./coverage [tool:pytest] -norecursedirs = repos/* pype/modules/ftrack/* \ No newline at end of file +norecursedirs = repos/* openpype/modules/ftrack/* \ No newline at end of file diff --git a/setup.py b/setup.py index e3be48d6e0..1c98935000 100644 --- a/setup.py +++ b/setup.py @@ -10,9 +10,9 @@ from sphinx.setup_command import BuildDoc version = {} -pype_root = Path(os.path.dirname(__file__)) +openpype_root = Path(os.path.dirname(__file__)) -with open(pype_root / "pype" / "version.py") as fp: +with open(openpype_root / "pype" / "version.py") as fp: exec(fp.read(), version) version_match = re.search(r"(\d+\.\d+.\d+).*", version["__version__"]) @@ -53,7 +53,7 @@ excludes = [] bin_includes = [] include_files = [ "igniter", - "pype", + "openpype", "repos", "schema", "vendor", @@ -78,28 +78,28 @@ build_options = dict( optimize=0 ) -icon_path = pype_root / "igniter" / "pype.ico" +icon_path = openpype_root / "igniter" / "pype.ico" executables = [ Executable("start.py", base=None, - target_name="pype_console", icon=icon_path.as_posix()), + target_name="openpype_console", icon=icon_path.as_posix()), Executable("start.py", base=base, - target_name="pype_gui", icon=icon_path.as_posix()) + target_name="openpype_gui", icon=icon_path.as_posix()) ] setup( - name="pype", + name="OpenPype", version=__version__, description="Ultimate pipeline", cmdclass={"build_sphinx": BuildDoc}, options={ "build_exe": build_options, "build_sphinx": { - "project": "Pype", + "project": "OpenPype", "version": __version__, "release": __version__, - "source_dir": (pype_root / "docs" / "source").as_posix(), - "build_dir": (pype_root / "docs" / "build").as_posix() + "source_dir": (openpype_root / "docs" / "source").as_posix(), + "build_dir": (openpype_root / "docs" / "build").as_posix() } }, executables=executables diff --git a/start.py b/start.py index 8d60a14403..dd9e81a698 100644 --- a/start.py +++ b/start.py @@ -1,46 +1,46 @@ # -*- coding: utf-8 -*- -"""Main entry point for Pype command. +"""Main entry point for OpenPype command. -Bootstrapping process of Pype is as follows: +Bootstrapping process of OpenPype is as follows: -`PYPE_PATH` is checked for existence - either one from environment or +`OPENPYPE_PATH` is checked for existence - either one from environment or from user settings. Precedence takes the one set by environment. -On this path we try to find pype in directories version string in their names. -For example: `pype-v3.0.1-foo` is valid name, or even `foo_3.0.2` - as long -as version can be determined from its name _AND_ file `pype/pype/version.py` -can be found inside, it is considered Pype installation. +On this path we try to find OpenPype in directories version string in their names. +For example: `openpype-v3.0.1-foo` is valid name, or even `foo_3.0.2` - as long +as version can be determined from its name _AND_ file `openpype/openpype/version.py` +can be found inside, it is considered OpenPype installation. -If no Pype repositories are found in `PYPE_PATH` (user data dir) -then **Igniter** (Pype setup tool) will launch its GUI. +If no OpenPype repositories are found in `OPENPYPE_PATH` (user data dir) +then **Igniter** (OpenPype setup tool) will launch its GUI. -It can be used to specify `PYPE_PATH` or if it is _not_ specified, current +It can be used to specify `OPENPYPE_PATH` or if it is _not_ specified, current *"live"* repositories will be used to create zip file and copy it to appdata dir in user home and extract it there. Version will be determined by -version specified in Pype module. +version specified in OpenPype module. -If Pype repository directories are found in default install location -(user data dir) or in `PYPE_PATH`, it will get list of those dirs there and +If OpenPype repository directories are found in default install location +(user data dir) or in `OPENPYPE_PATH`, it will get list of those dirs there and use latest one or the one specified with optional `--use-version` command line argument. If the one specified doesn't exist then latest available version will be used. All repositories in that dir will be added to `sys.path` and `PYTHONPATH`. -If Pype is live (not frozen) then current version of Pype module will be +If OpenPype is live (not frozen) then current version of OpenPype module will be used. All directories under `repos` will be added to `sys.path` and `PYTHONPATH`. -Pype depends on connection to `MongoDB`_. You can specify MongoDB connection -string via `PYPE_MONGO` set in environment or it can be set in user +OpenPype depends on connection to `MongoDB`_. You can specify MongoDB connection +string via `OPENPYPE_MONGO` set in environment or it can be set in user settings or via **Igniter** GUI. -So, bootstrapping Pype looks like this:: +So, bootstrapping OpenPype looks like this:: .. code-block:: bash +-------------------------------------------------------+ | Determine MongoDB connection: | -| Use `PYPE_MONGO`, system keyring `pypeMongo` | +| Use `OPENPYPE_MONGO`, system keyring `openPypeMongo` | +--------------------------|----------------------------+ .--- Found? --. YES NO @@ -52,9 +52,9 @@ So, bootstrapping Pype looks like this:: | | | | +-----------------v------------------------------------+ | -| Get location of Pype: | | -| 1) Test for `PYPE_PATH` environment variable | | -| 2) Test `pypePath` in registry setting | | +| Get location of OpenPype: | | +| 1) Test for `OPENPYPE_PATH` environment variable | | +| 2) Test `openPypePath` in registry setting | | | 3) Test user data directory | | | ................................................... | | | If running from frozen code: | | @@ -63,21 +63,21 @@ So, bootstrapping Pype looks like this:: | - Use live code and install it to user data dir | | | * can be overridden with `--use-version` argument | | +-------------------------|----------------------------+ | - .-- Is Pype found? --. | - YES NO | - | | | - | +--------------v------------------+ | - | | Look in `PYPE_PATH`, find | | + .-- Is OpenPype found? --. | + YES NO | + | | | + | +---------------v-----------------+ | + | | Look in `OPENPYPE_PATH`, find | | | | latest version and install it | | | | to user data dir. | | | +--------------|------------------+ | - | .-- Is Pype found? --. | - | YES NO ---------+ + | .-- Is OpenPype found? --. | + | YES NO --------+ | | |<---------+ | +-------------v------------+ -| Run Pype | +| Run OpenPype | +--------------------------+ @@ -85,7 +85,7 @@ Todo: Move or remove bootstrapping environments out of the code. Attributes: - silent_commands (list): list of commands for which we won't print Pype + silent_commands (list): list of commands for which we won't print OpenPype logo and info header. .. _MongoDB: diff --git a/tools/build.ps1 b/tools/build.ps1 index e0a74bbaa3..70e6b68377 100644 --- a/tools/build.ps1 +++ b/tools/build.ps1 @@ -1,11 +1,12 @@ <# .SYNOPSIS - Helper script to build Pype. + Helper script to build OpenPype. .DESCRIPTION - This script will detect Python installation, create venv and install - all necessary packages from `requirements.txt` needed by Pype to be - included during application freeze on Windows. + This script will detect Python installation, and build OpenPype to `build` + directory using existing virtual environment created by Poetry (or + by running `/tools/create_venv.ps1`). It will then shuffle dependencies in + build folder to optimize for different Python versions (2/3) in Python host. .EXAMPLE @@ -75,14 +76,11 @@ function Install-Poetry() { $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -93,28 +91,28 @@ Write-Host $art -ForegroundColor DarkGreen $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName +$openpype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +Set-Location -Path $openpype_root -$version_file = Get-Content -Path "$($pype_root)\pype\version.py" +$version_file = Get-Content -Path "$($openpype_root)\pype\version.py" $result = [regex]::Matches($version_file, '__version__ = "(?\d+\.\d+.\d+.*)"') -$pype_version = $result[0].Groups['version'].Value -if (-not $pype_version) { +$openpype_version = $result[0].Groups['version'].Value +if (-not $openpype_version) { Write-Host "!!! " -ForegroundColor yellow -NoNewline - Write-Host "Cannot determine Pype version." + Write-Host "Cannot determine OpenPype version." Exit-WithCode 1 } # Create build directory if not exist -if (-not (Test-Path -PathType Container -Path "$($pype_root)\build")) { - New-Item -ItemType Directory -Force -Path "$($pype_root)\build" +if (-not (Test-Path -PathType Container -Path "$($openpype_root)\build")) { + New-Item -ItemType Directory -Force -Path "$($openpype_root)\build" } Write-Host "--- " -NoNewline -ForegroundColor yellow Write-Host "Cleaning build directory ..." try { - Remove-Item -Recurse -Force "$($pype_root)\build\*" + Remove-Item -Recurse -Force "$($openpype_root)\build\*" } catch { Write-Host "!!! " -NoNewline -ForegroundColor Red @@ -124,8 +122,8 @@ catch { } Write-Host ">>> " -NoNewline -ForegroundColor green -Write-Host "Building Pype [ " -NoNewline -ForegroundColor white -Write-host $pype_version -NoNewline -ForegroundColor green +Write-Host "Building OpenPype [ " -NoNewline -ForegroundColor white +Write-host $openpype_version -NoNewline -ForegroundColor green Write-Host " ] ..." -ForegroundColor white Write-Host ">>> " -NoNewline -ForegroundColor green @@ -167,31 +165,31 @@ if (-not (Test-Path -PathType Container -Path "$($env:USERPROFILE)\.poetry\bin") Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Cleaning cache files ... " -NoNewline -Get-ChildItem $pype_root -Filter "*.pyc" -Force -Recurse | Remove-Item -Force -Get-ChildItem $pype_root -Filter "*.pyo" -Force -Recurse | Remove-Item -Force -Get-ChildItem $pype_root -Filter "__pycache__" -Force -Recurse | Remove-Item -Force -Recurse +Get-ChildItem $openpype_root -Filter "*.pyc" -Force -Recurse | Remove-Item -Force +Get-ChildItem $openpype_root -Filter "*.pyo" -Force -Recurse | Remove-Item -Force +Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse | Remove-Item -Force -Recurse Write-Host "OK" -ForegroundColor green Write-Host ">>> " -NoNewline -ForegroundColor green -Write-Host "Building Pype ..." +Write-Host "Building OpenPype ..." $out = & poetry run python setup.py build 2>&1 if ($LASTEXITCODE -ne 0) { - Set-Content -Path "$($pype_root)\build\build.log" -Value $out + Set-Content -Path "$($openpype_root)\build\build.log" -Value $out Write-Host "!!! " -NoNewLine -ForegroundColor Red Write-Host "Build failed. Check the log: " -NoNewline Write-Host ".\build\build.log" -ForegroundColor Yellow Exit-WithCode $LASTEXITCODE } -Set-Content -Path "$($pype_root)\build\build.log" -Value $out -& poetry run python "$($pype_root)\tools\build_dependencies.py" +Set-Content -Path "$($openpype_root)\build\build.log" -Value $out +& poetry run python "$($openpype_root)\tools\build_dependencies.py" Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "restoring current directory" Set-Location -Path $current_dir Write-Host "*** " -NoNewline -ForegroundColor Cyan -Write-Host "All done. You will find Pype and build log in " -NoNewLine +Write-Host "All done. You will find OpenPype and build log in " -NoNewLine Write-Host "'.\build'" -NoNewline -ForegroundColor Green Write-Host " directory." diff --git a/tools/build.sh b/tools/build.sh index 27d10f1d4d..b95e2969c4 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -5,13 +5,12 @@ art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -93,7 +92,7 @@ detect_python () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$openpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -136,16 +135,16 @@ main () { detect_python || return 1 # Directories - pype_root=$(dirname $(dirname "$(realpath ${BASH_SOURCE[0]})")) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(dirname $(dirname "$(realpath ${BASH_SOURCE[0]})")) + pushd "$openpype_root" > /dev/null || return > /dev/null - version_command="import os;exec(open(os.path.join('$pype_root', 'pype', 'version.py')).read());print(__version__);" - pype_version="$(python3 <<< ${version_command})" + version_command="import os;exec(open(os.path.join('$openpype_root', 'openpype', 'version.py')).read());print(__version__);" + openpype_version="$(python3 <<< ${version_command})" echo -e "${BIYellow}---${RST} Cleaning build directory ..." - rm -rf "$pype_root/build" && mkdir "$pype_root/build" > /dev/null + rm -rf "$openpype_root/build" && mkdir "$openpype_root/build" > /dev/null - echo -e "${BIGreen}>>>${RST} Building Pype ${BIWhite}[${RST} ${BIGreen}$pype_version${RST} ${BIWhite}]${RST}" + echo -e "${BIGreen}>>>${RST} Building OpenPype ${BIWhite}[${RST} ${BIGreen}$openpype_version${RST} ${BIWhite}]${RST}" echo -e "${BIGreen}>>>${RST} Cleaning cache files ..." clean_pyc @@ -159,11 +158,11 @@ main () { fi echo -e "${BIGreen}>>>${RST} Building ..." - poetry run python3 "$pype_root/setup.py" build > "$pype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; } - poetry run python3 "$pype_root/tools/build_dependencies.py" + poetry run python3 "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; } + poetry run python3 "$openpype_root/tools/build_dependencies.py" - echo -e "${BICyan}>>>${RST} All done. You will find Pype and build log in \c" - echo -e "${BIWhite}$pype_root/build${RST} directory." + echo -e "${BICyan}>>>${RST} All done. You will find OpenPype and build log in \c" + echo -e "${BIWhite}$openpype_root/build${RST} directory." } main diff --git a/tools/build_dependencies.py b/tools/build_dependencies.py index ada786e96f..e49e930a70 100644 --- a/tools/build_dependencies.py +++ b/tools/build_dependencies.py @@ -101,8 +101,8 @@ for d in libs_dir.iterdir(): to_delete.append(d) _print(f"found {d}", 3) -# add pype and igniter in libs too -to_delete.append(libs_dir / "pype") +# add openpype and igniter in libs too +to_delete.append(libs_dir / "openpype") to_delete.append(libs_dir / "igniter") # delete duplicates diff --git a/tools/create_env.ps1 b/tools/create_env.ps1 index ccc0cab2e7..44e1799be8 100644 --- a/tools/create_env.ps1 +++ b/tools/create_env.ps1 @@ -1,11 +1,11 @@ <# .SYNOPSIS - Helper script create virtual env. + Helper script create virtual environment using Poetry. .DESCRIPTION - This script will detect Python installation, create venv and install - all necessary packages from `requirements.txt` needed by Pype to be - included during application freeze on Windows. + This script will detect Python installation, create venv with Poetry + and install all necessary packages from `poetry.lock` or `pyproject.toml` + needed by OpenPype to be included during application freeze on Windows. .EXAMPLE @@ -82,20 +82,17 @@ print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1])) $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName +$openpype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +Set-Location -Path $openpype_root $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -104,18 +101,18 @@ Write-Host $art -ForegroundColor DarkGreen # Enable if PS 7.x is needed. # Show-PSWarning -$version_file = Get-Content -Path "$($pype_root)\pype\version.py" +$version_file = Get-Content -Path "$($openpype_root)\openpype\version.py" $result = [regex]::Matches($version_file, '__version__ = "(?\d+\.\d+.\d+.*)"') -$pype_version = $result[0].Groups['version'].Value -if (-not $pype_version) { +$openpype_version = $result[0].Groups['version'].Value +if (-not $openpype_version) { Write-Host "!!! " -ForegroundColor yellow -NoNewline - Write-Host "Cannot determine Pype version." + Write-Host "Cannot determine OpenPype version." Set-Location -Path $current_dir Exit-WithCode 1 } Write-Host ">>> " -NoNewline -ForegroundColor Green -Write-Host "Found Pype version " -NoNewline -Write-Host "[ $($pype_version) ]" -ForegroundColor Green +Write-Host "Found OpenPype version " -NoNewline +Write-Host "[ $($openpype_version) ]" -ForegroundColor Green Test-Python @@ -129,7 +126,7 @@ if (-not (Test-Path -PathType Container -Path "$($env:USERPROFILE)\.poetry\bin") Write-Host "OK" -ForegroundColor Green } -if (-not (Test-Path -PathType Leaf -Path "$($pype_root)\poetry.lock")) { +if (-not (Test-Path -PathType Leaf -Path "$($openpype_root)\poetry.lock")) { Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Installing virtual environment and creating lock." } else { @@ -145,4 +142,4 @@ if ($LASTEXITCODE -ne 0) { } Set-Location -Path $current_dir Write-Host ">>> " -NoNewline -ForegroundColor green -Write-Host "Virtual environment created. " \ No newline at end of file +Write-Host "Virtual environment created." diff --git a/tools/create_env.sh b/tools/create_env.sh index 52bc79ca83..6ca0731963 100755 --- a/tools/create_env.sh +++ b/tools/create_env.sh @@ -1,19 +1,17 @@ #!/usr/bin/env bash -# This script will detect Python installation, and create virtual environment -# for Pype to run or build. - +# This script will detect Python installation, create venv with Poetry +# and install all necessary packages from `poetry.lock` or `pyproject.toml` +# needed by OpenPype to be included during application freeze on unix. art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -117,7 +115,7 @@ install_poetry () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$openpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -144,8 +142,8 @@ main () { detect_python || return 1 # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" > /dev/null || return > /dev/null echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c" if [ -f "$HOME/.poetry/bin/poetry" ]; then @@ -156,7 +154,7 @@ main () { install_poetry || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; } fi - if [ -f "$pype_root/poetry.lock" ]; then + if [ -f "$openpype_root/poetry.lock" ]; then echo -e "${BIGreen}>>>${RST} Updating dependencies ..." else echo -e "${BIGreen}>>>${RST} Installing dependencies ..." diff --git a/tools/create_zip.ps1 b/tools/create_zip.ps1 index 900bc0d523..d18806c40b 100644 --- a/tools/create_zip.ps1 +++ b/tools/create_zip.ps1 @@ -1,11 +1,12 @@ <# .SYNOPSIS - Helper script create distributable Pype zip. + Helper script create distributable OpenPype zip. .DESCRIPTION - This script will detect Python installation, create venv and install - all necessary packages from `requirements.txt` needed by Pype to be - included during application freeze on Windows. + This script will detect Python installation and run OpenPype to create + zip. It needs mongodb running. I will create zip from current source code + version and copy it top `%LOCALAPPDATA%/pypeclub/pype` if `--path` or `-p` + argument is not used. .EXAMPLE @@ -35,19 +36,16 @@ function Show-PSWarning() { $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +$openpype_root = (Get-Item $script_dir).parent.FullName +Set-Location -Path $openpype_root $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -56,12 +54,12 @@ Write-Host $art -ForegroundColor DarkGreen # Enable if PS 7.x is needed. # Show-PSWarning -$version_file = Get-Content -Path "$($pype_root)\pype\version.py" +$version_file = Get-Content -Path "$($openpype_root)\openpype\version.py" $result = [regex]::Matches($version_file, '__version__ = "(?\d+\.\d+.\d+.*)"') -$pype_version = $result[0].Groups['version'].Value -if (-not $pype_version) { +$openpype_version = $result[0].Groups['version'].Value +if (-not $openpype_version) { Write-Host "!!! " -ForegroundColor yellow -NoNewline - Write-Host "Cannot determine Pype version." + Write-Host "Cannot determine OpenPype version." Exit-WithCode 1 } @@ -95,5 +93,5 @@ Write-Host "Generating zip from current sources ..." Write-Host "... " -NoNewline -ForegroundColor Magenta Write-Host "arguments: " -NoNewline -ForegroundColor Gray Write-Host $ARGS -ForegroundColor White -& poetry run python "$($pype_root)\start.py" generate-zip $ARGS +& poetry run python "$($openpype_root)\start.py" generate-zip $ARGS Set-Location -Path $current_dir \ No newline at end of file diff --git a/tools/create_zip.sh b/tools/create_zip.sh index 839b1c4827..6e7f792f1d 100755 --- a/tools/create_zip.sh +++ b/tools/create_zip.sh @@ -1,17 +1,18 @@ #!/usr/bin/env bash -# Helper script to create Pype zip. - +# This script will detect Python installation and run OpenPype to create +# zip. It needs mongodb running. I will create zip from current source code +# version and copy it top `~/.local/share/pype` if `--path` or `-p` +# argument is not used. art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -91,7 +92,7 @@ detect_python () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$openpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -118,11 +119,11 @@ main () { detect_python || return 1 # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" > /dev/null || return > /dev/null echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..." - poetry run python3 "$pype_root/start.py" generate-zip "$@" + poetry run python3 "$openpype_root/start.py" generate-zip "$@" } main "$@" diff --git a/tools/make_docs.ps1 b/tools/make_docs.ps1 index 8ce991d5bb..aa526bbdc9 100644 --- a/tools/make_docs.ps1 +++ b/tools/make_docs.ps1 @@ -1,9 +1,9 @@ <# .SYNOPSIS - Helper script to update Pype Sphinx sources. + Helper script to update OpenPype Sphinx sources. .DESCRIPTION - This script will run apidoc over Pype sources and generate new source rst + This script will run apidoc over OpenPype sources and generate new source rst files for documentation. Then it will run build_sphinx to create test html documentation build. @@ -15,33 +15,31 @@ PS> .\make_docs.ps1 $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +$openpype_root = (Get-Item $script_dir).parent.FullName +Set-Location -Path $openpype_root $art = @" - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ Write-Host $art -ForegroundColor DarkGreen Write-Host "This will not overwrite existing source rst files, only scan and add new." -Set-Location -Path $pype_root +Set-Location -Path $openpype_root Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Running apidoc ..." -& poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($pype_root)\docs\source" igniter -& poetry run sphinx-apidoc.exe -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($pype_root)\docs\source" pype vendor, pype\vendor +& poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" igniter +& poetry run sphinx-apidoc.exe -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" openpype vendor, openpype\vendor Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Building html ..." -& poetry run python "$($pype_root)\setup.py" build_sphinx +& poetry run python "$($openpype_root)\setup.py" build_sphinx Set-Location -Path $current_dir diff --git a/tools/make_docs.sh b/tools/make_docs.sh index ed5c72b055..2ac12d3d95 100755 --- a/tools/make_docs.sh +++ b/tools/make_docs.sh @@ -1,18 +1,17 @@ #!/usr/bin/env bash -# Make Pype documentation - +# This script will run apidoc over OpenPype sources and generate new source rst +# files for documentation. Then it will run build_sphinx to create test html +# documentation build. art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -71,15 +70,15 @@ main () { echo -e "${RST}" # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" > /dev/null || return > /dev/null echo -e "${BIGreen}>>>${RST} Running apidoc ..." - poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$pype_root/docs/source" igniter - poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$pype_root/docs/source" pype vendor, pype\vendor + poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" igniter + poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" openpype vendor, openpype\vendor echo -e "${BIGreen}>>>${RST} Building html ..." - poetry run python3 "$pype_root/setup.py" build_sphinx + poetry run python3 "$openpype_root/setup.py" build_sphinx } main diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1 index a72c8b1210..da5f4aaa26 100644 --- a/tools/run_mongo.ps1 +++ b/tools/run_mongo.ps1 @@ -13,14 +13,11 @@ PS> .\run_mongo.ps1 $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -80,13 +77,13 @@ function Find-Mongo { } $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName +$openpype_root = (Get-Item $script_dir).parent.FullName # mongodb port $port = 2707 # path to database -$dbpath = (Get-Item $pype_root).parent.FullName + "\mongo_db_data" +$dbpath = (Get-Item $openpype_root).parent.FullName + "\mongo_db_data" Find-Mongo $mongo = Get-Command "mongod" | Select-Object -ExpandProperty Definition diff --git a/tools/run_mongo.sh b/tools/run_mongo.sh index 209e80ac5b..1c788abcaf 100755 --- a/tools/run_mongo.sh +++ b/tools/run_mongo.sh @@ -6,13 +6,12 @@ art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -72,11 +71,11 @@ main () { echo -e "${RST}" # Directories - pype_root=$(dirname $(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(dirname $(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))) + pushd "$openpype_root" > /dev/null || return > /dev/null mongo_port=2707 - dbpath="$(dirname $pype_root)/mongo_db_data" + dbpath="$(dirname $openpype_root)/mongo_db_data" echo -e "${BIGreen}>>>${RST} Running mongodb ..." mongod --dbpath "$dbpath" --port $mongo_port diff --git a/tools/run_settings.ps1 b/tools/run_settings.ps1 index acecae0bb6..3f99de4b4e 100644 --- a/tools/run_settings.ps1 +++ b/tools/run_settings.ps1 @@ -1,9 +1,9 @@ <# .SYNOPSIS - Helper script to Pype Settings UI + Helper script to OpenPype Settings UI .DESCRIPTION - This script will run Pype and open Settings UI. + This script will run OpenPype and open Settings UI. .EXAMPLE @@ -13,7 +13,7 @@ PS> .\run_settings.ps1 $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root -& poetry run python "$($pype_root)\start.py" settings --dev +$openpype_root = (Get-Item $script_dir).parent.FullName +Set-Location -Path $openpype_root +& poetry run python "$($openpype_root)\start.py" settings --dev Set-Location -Path $current_dir \ No newline at end of file diff --git a/tools/run_settings.sh b/tools/run_settings.sh index 99148456c0..0c8a951d7c 100755 --- a/tools/run_settings.sh +++ b/tools/run_settings.sh @@ -1,17 +1,16 @@ #!/usr/bin/env bash -# Run Pype Settings GUI +# Run OpenPype Settings GUI art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -91,7 +90,7 @@ detect_python () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$oepnpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -118,11 +117,11 @@ main () { detect_python || return 1 # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" > /dev/null || return > /dev/null echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..." - poetry run python3 "$pype_root/start.py" settings --dev + poetry run python3 "$openpype_root/start.py" settings --dev } main diff --git a/tools/run_tests.ps1 b/tools/run_tests.ps1 index 0f66c0079f..5070591c02 100644 --- a/tools/run_tests.ps1 +++ b/tools/run_tests.ps1 @@ -1,11 +1,9 @@ <# .SYNOPSIS - Helper script to build Pype. + Helper script to run tests for OpenPype. .DESCRIPTION - This script will detect Python installation, create venv and install - all necessary packages from `requirements.txt` needed by Pype to be - included during application freeze on Windows. + This will use virtual environment and pytest to run test for OpenPype. .EXAMPLE @@ -34,14 +32,11 @@ function Show-PSWarning() { $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -52,22 +47,22 @@ Write-Host $art -ForegroundColor DarkGreen $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName +$openpype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +Set-Location -Path $openpype_root -$version_file = Get-Content -Path "$($pype_root)\pype\version.py" +$version_file = Get-Content -Path "$($openpype_root)\openpype\version.py" $result = [regex]::Matches($version_file, '__version__ = "(?\d+\.\d+.\d+.*)"') -$pype_version = $result[0].Groups['version'].Value -if (-not $pype_version) { +$openpype_version = $result[0].Groups['version'].Value +if (-not $openpype_version) { Write-Host "!!! " -ForegroundColor yellow -NoNewline - Write-Host "Cannot determine Pype version." + Write-Host "Cannot determine OpenPype version." Exit-WithCode 1 } Write-Host ">>> " -NoNewline -ForegroundColor green -Write-Host "Building Pype [ " -NoNewline -ForegroundColor white -Write-host $pype_version -NoNewline -ForegroundColor green +Write-Host "Building OpenPype [ " -NoNewline -ForegroundColor white +Write-host $openpype_version -NoNewline -ForegroundColor green Write-Host " ] ..." -ForegroundColor white Write-Host ">>> " -NoNewline -ForegroundColor green @@ -97,15 +92,15 @@ Write-Host "OK [ $p ]" -ForegroundColor green Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Cleaning cache files ... " -NoNewline -Get-ChildItem $pype_root -Filter "*.pyc" -Force -Recurse | Remove-Item -Force -Get-ChildItem $pype_root -Filter "__pycache__" -Force -Recurse | Remove-Item -Force -Recurse +Get-ChildItem $openpype_root -Filter "*.pyc" -Force -Recurse | Remove-Item -Force +Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse | Remove-Item -Force -Recurse Write-Host "OK" -ForegroundColor green Write-Host ">>> " -NoNewline -ForegroundColor green -Write-Host "Testing Pype ..." +Write-Host "Testing OpenPype ..." $original_pythonpath = $env:PYTHONPATH -$env:PYTHONPATH="$($pype_root);$($env:PYTHONPATH)" -& poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$($pype_root)/tests" +$env:PYTHONPATH="$($openpype_root);$($env:PYTHONPATH)" +& poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$($openpype_root)/tests" $env:PYTHONPATH = $original_pythonpath Write-Host ">>> " -NoNewline -ForegroundColor green diff --git a/tools/run_tests.sh b/tools/run_tests.sh index df001dce97..0af052ca01 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -1,17 +1,16 @@ #!/usr/bin/env bash -# Run tests for Pype - +# Run tests for OpenPype +# This will use virtual environment and pytest to run test for OpenPype. art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -87,7 +86,7 @@ detect_python () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$openpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -114,13 +113,13 @@ main () { detect_python || return 1 # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" || return > /dev/null - echo -e "${BIGreen}>>>${RST} Testing Pype ..." + echo -e "${BIGreen}>>>${RST} Testing OpenPype ..." original_pythonpath=$PYTHONPATH - export PYTHONPATH="$pype_root:$PYTHONPATH" - poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$pype_root/tests" + export PYTHONPATH="$openpype_root:$PYTHONPATH" + poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$openpype_root/tests" PYTHONPATH=$original_pythonpath } diff --git a/tools/run_tray.ps1 b/tools/run_tray.ps1 index 9584c05925..9485584c6f 100644 --- a/tools/run_tray.ps1 +++ b/tools/run_tray.ps1 @@ -1,6 +1,6 @@ <# .SYNOPSIS - Helper script Pype Tray. + Helper script OpenPype Tray. .DESCRIPTION @@ -12,8 +12,8 @@ PS> .\run_tray.ps1 #> $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +$openpype_root = (Get-Item $script_dir).parent.FullName +Set-Location -Path $openpype_root -& poetry run python "$($pype_root)\start.py" tray --debug +& poetry run python "$($openpype_root)\start.py" tray --debug Set-Location -Path $current_dir \ No newline at end of file diff --git a/tools/run_tray.sh b/tools/run_tray.sh index 3c63d0babe..8174f7e38a 100755 --- a/tools/run_tray.sh +++ b/tools/run_tray.sh @@ -1,17 +1,16 @@ #!/usr/bin/env bash -# Run Pype Tray +# Run OpenPype Tray art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io EOF } @@ -92,7 +91,7 @@ detect_python () { ############################################################################### clean_pyc () { local path - path=$pype_root + path=$openpype_root echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c" find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete echo -e "${BIGreen}DONE${RST}" @@ -119,11 +118,11 @@ main () { detect_python || return 1 # Directories - pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) - pushd "$pype_root" > /dev/null || return > /dev/null + openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + pushd "$openpype_root" > /dev/null || return > /dev/null - echo -e "${BIGreen}>>>${RST} Running Pype Tray with debug option ..." - poetry run python3 "$pype_root/start.py" tray --debug + echo -e "${BIGreen}>>>${RST} Running OpenPype Tray with debug option ..." + poetry run python3 "$openpype_root/start.py" tray --debug } main \ No newline at end of file diff --git a/tools/update_submodules.ps1 b/tools/update_submodules.ps1 index ca29c7ecc4..d0f93d9f7e 100644 --- a/tools/update_submodules.ps1 +++ b/tools/update_submodules.ps1 @@ -1,26 +1,20 @@ <# .SYNOPSIS - Helper script to run mongodb. - -.DESCRIPTION - This script will detect mongodb, add it to the PATH and launch it on specified port and db location. + Helper script to update submodules. .EXAMPLE -PS> .\run_mongo.ps1 +PS> .\update_submodules.ps1 #> $art = @" - - ____________ - /\ ___ \ - \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. + https://openpype.io "@ @@ -37,9 +31,9 @@ function Exit-WithCode($exitcode) { $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$pype_root = (Get-Item $script_dir).parent.FullName +$openpype_root = (Get-Item $script_dir).parent.FullName -Set-Location -Path $pype_root +Set-Location -Path $openpype_root git submodule update --recursive --remote diff --git a/tools/update_submodules.sh b/tools/update_submodules.sh index 35d943dea5..465827bfbb 100644 --- a/tools/update_submodules.sh +++ b/tools/update_submodules.sh @@ -1,17 +1,15 @@ #!/usr/bin/env bash -# Run Pype Tray +# Run OpenPype Tray art () { cat <<-EOF - ____________ - /\\ ___ \\ - \\ \\ \\/_\\ \\ - \\ \\ _____/ ______ ___ ___ ___ - \\ \\ \\___/ /\\ \\ \\ \\\\ \\\\ \\ - \\ \\____\\ \\ \\_____\\ \\__\\\\__\\\\__\\ - \\/____/ \\/_____/ . PYPE Club . + +▒█▀▀▀█ █▀▀█ █▀▀ █▀▀▄ ▒█▀▀█ █░░█ █▀▀█ █▀▀ ▀█▀ ▀█▀ ▀█▀ +▒█░░▒█ █░░█ █▀▀ █░░█ ▒█▄▄█ █▄▄█ █░░█ █▀▀ ▒█░ ▒█░ ▒█░ +▒█▄▄▄█ █▀▀▀ ▀▀▀ ▀░░▀ ▒█░░░ ▄▄▄█ █▀▀▀ ▀▀▀ ▄█▄ ▄█▄ ▄█▄ + .---= [ by Pype Club ] =---. EOF }