Skip to content

chore: fix update of pyproject toml version #1395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsja merged 10 commits into from
Apr 17, 2023
Merged

chore: fix update of pyproject toml version #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
567ff9b
chore: fix update of pyproject toml version
samsja Apr 17, 2023
76eed56
chore: fix pyporject version ipdate
samsja Apr 17, 2023
3fb4b81
chore: fix pyporject version ipdate
samsja Apr 17, 2023
7fd39aa
chore: fix pyporject version ipdate
samsja Apr 17, 2023
9bc24a3
Merge branch 'main' into chore-fix-prerelease
samsja Apr 17, 2023
d18928b
chore: fix ready to merge
samsja Apr 17, 2023
8681d40
Revert "chore: fix ready to merge"
samsja Apr 17, 2023
f6e6e48
chore: fix remove bug
samsja Apr 17, 2023
c031dbc
chore: fix remove bug
samsja Apr 17, 2023
d422145
chore: fix ready to merge
samsja Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- chore-fix-prerelease

jobs:
success-all-test:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "docarray"
version = '0.30.0a4'
version = '0.30.0'
description='The data structure for multimodal data'
readme = 'README.md'
authors=['DocArray']
Expand Down
28 changes: 26 additions & 2 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
set -ex

INIT_FILE='docarray/__init__.py'
VER_TAG='__version__ = '
PYPROJECT_FILE='pyproject.toml'
VER_TAG_PYPROJECT="version = "
VER_TAG="__version__ = "
RELEASENOTE='./node_modules/.bin/git-release-notes'

function escape_slashes {
Expand All @@ -25,6 +27,16 @@ function update_ver_line {
head -n10 ${FILE}
}

function update_ver_line_pyproject {
local OLD_LINE_PATTERN=$1
local NEW_LINE=$2
local FILE=$3

local NEW=$(echo "${NEW_LINE}" | escape_slashes)
sed -i '3{/'"${OLD_LINE_PATTERN}"'/s/.*/'"${NEW}"'/}' "${FILE}"
head -n10 ${FILE}
}


function clean_build {
rm -rf dist
Expand All @@ -33,7 +45,6 @@ function clean_build {
}

function pub_pypi {
# publish to pypi
clean_build
poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD
poetry publish --build
Expand Down Expand Up @@ -88,6 +99,11 @@ if [[ $1 == "final" ]]; then

VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\'
update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE"

VER_TAG_NEXT_PYPROJECT=$VER_TAG_PYPROJECT\'${NEXT_VER}\'
update_ver_line_pyproject "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT_PYPROJECT" "$PYPROJECT_FILE"


RELEASE_REASON="$2"
RELEASE_ACTOR="$3"
git_commit
Expand All @@ -104,6 +120,11 @@ elif [[ $1 == 'rc' ]]; then

VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\'
update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE"

VER_TAG_NEXT_PYPROJECT=$VER_TAG_PYPROJECT\'${NEXT_VER}\'
update_ver_line_pyproject "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT_PYPROJECT" "$PYPROJECT_FILE"


RELEASE_REASON="$2"
RELEASE_ACTOR="$3"
git_commit
Expand All @@ -116,5 +137,8 @@ else
VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\'
update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE"

VER_TAG_NEXT_PYPROJECT=$VER_TAG_PYPROJECT\'${NEXT_VER}\'
update_ver_line_pyproject "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT_PYPROJECT" "$PYPROJECT_FILE"

pub_pypi
fi