Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3777 from pypeclub/chore/fix_poetry_toml_version_…
Browse files Browse the repository at this point in the history
…format

Fix - changed format of version string in pyproject.toml
  • Loading branch information
antirotor authored Sep 2, 2022
2 parents ab964eb + d224054 commit b924ced
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "OpenPype"
version = "3.14.2-nightly.1" # OpenPype
version = "3.14.2+nightly.1" # OpenPype
description = "Open VFX and Animation pipeline with support."
authors = ["OpenPype Team <info@openpype.io>"]
license = "MIT License"
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def bump_file_versions(version):

# bump pyproject.toml
filename = "pyproject.toml"
regex = "version = \"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-((0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?\" # OpenPype"
regex = "version = \"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(\+((0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?\" # OpenPype"
pyproject_version = f"version = \"{version}\" # OpenPype"
file_regex_replace(filename, regex, pyproject_version)

Expand Down
1 change: 1 addition & 0 deletions tools/create_env.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function Install-Poetry() {
}

$env:POETRY_HOME="$openpype_root\.poetry"
$env:POETRY_VERSION="1.1.15"
(Invoke-WebRequest -Uri https://install.python-poetry.org/ -UseBasicParsing).Content | & $($python) -
}

Expand Down
1 change: 1 addition & 0 deletions tools/create_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ detect_python () {
install_poetry () {
echo -e "${BIGreen}>>>${RST} Installing Poetry ..."
export POETRY_HOME="$openpype_root/.poetry"
export POETRY_VERSION="1.1.15"
command -v curl >/dev/null 2>&1 || { echo -e "${BIRed}!!!${RST}${BIYellow} Missing ${RST}${BIBlue}curl${BIYellow} command.${RST}"; return 1; }
curl -sSL https://install.python-poetry.org/ | python -
}
Expand Down

0 comments on commit b924ced

Please sign in to comment.