From 567ff9bddf3cbd166127db6f56566af547061f3d Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 15:53:26 +0200 Subject: [PATCH 1/9] chore: fix update of pyproject toml version Signed-off-by: samsja --- scripts/release.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 06f601e9b7e..3dd0e4847b2 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -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__ = '0." RELEASENOTE='./node_modules/.bin/git-release-notes' function escape_slashes { @@ -33,7 +35,7 @@ function clean_build { } function pub_pypi { - # publish to pypi + publish to pypi clean_build poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD poetry publish --build @@ -88,6 +90,8 @@ if [[ $1 == "final" ]]; then VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" + update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_FILE" + RELEASE_REASON="$2" RELEASE_ACTOR="$3" git_commit @@ -104,6 +108,8 @@ elif [[ $1 == 'rc' ]]; then VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" + update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_FILE" + RELEASE_REASON="$2" RELEASE_ACTOR="$3" git_commit @@ -115,6 +121,7 @@ else VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" + update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_FILE" pub_pypi fi From 76eed56aab32bfe745773cecce783bc92ff6c624 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:27:03 +0200 Subject: [PATCH 2/9] chore: fix pyporject version ipdate Signed-off-by: samsja --- docs/_versions.json | 2 +- pyproject.toml | 2 +- scripts/release.sh | 36 +++++++++++++++++++++++++++--------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/docs/_versions.json b/docs/_versions.json index 7f917611e51..9e92cd69930 100644 --- a/docs/_versions.json +++ b/docs/_versions.json @@ -1 +1 @@ -[{"version": "v0.21.0"}, {"version": "v0.20.1"}, {"version": "v0.20.0"}, {"version": "v0.19.0"}, {"version": "v0.18.1"}, {"version": "v0.18.0"}, {"version": "v0.17.0"}, {"version": "v0.16.5"}, {"version": "v0.16.4"}, {"version": "v0.16.3"}, {"version": "v0.16.2"}, {"version": "v0.16.1"}, {"version": "v0.16.0"}, {"version": "v0.15.4"}, {"version": "v0.15.3"}, {"version": "v0.15.2"}, {"version": "v0.15.1"}, {"version": "v0.15.0"}, {"version": "v0.14.11"}, {"version": "v0.14.10"}, {"version": "v0.14.9"}, {"version": "v0.14.8"}, {"version": "v0.14.7"}, {"version": "v0.14.6"}, {"version": "v0.14.5"}, {"version": "v0.14.4"}, {"version": "v0.14.3"}, {"version": "v0.14.2"}, {"version": "v0.14.1"}, {"version": "v0.14.0"}, {"version": "v0.13.33"}, {"version": "v0.13.0"}, {"version": "v0.12.9"}, {"version": "v0.12.0"}, {"version": "v0.11.3"}, {"version": "v0.11.2"}, {"version": "v0.11.1"}, {"version": "v0.11.0"}, {"version": "v0.10.5"}, {"version": "v0.10.4"}, {"version": "v0.10.3"}, {"version": "v0.10.2"}, {"version": "v0.10.1"}, {"version": "v0.10.0"}] \ No newline at end of file +[{"version": "v0.30.0"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.21.0"}, {"version": "v0.20.1"}, {"version": "v0.20.0"}, {"version": "v0.19.0"}, {"version": "v0.18.1"}, {"version": "v0.18.0"}, {"version": "v0.17.0"}, {"version": "v0.16.5"}, {"version": "v0.16.4"}, {"version": "v0.16.3"}, {"version": "v0.16.2"}, {"version": "v0.16.1"}, {"version": "v0.16.0"}, {"version": "v0.15.4"}, {"version": "v0.15.3"}, {"version": "v0.15.2"}, {"version": "v0.15.1"}, {"version": "v0.15.0"}, {"version": "v0.14.11"}, {"version": "v0.14.10"}, {"version": "v0.14.9"}, {"version": "v0.14.8"}, {"version": "v0.14.7"}, {"version": "v0.14.6"}, {"version": "v0.14.5"}, {"version": "v0.14.4"}, {"version": "v0.14.3"}, {"version": "v0.14.2"}, {"version": "v0.14.1"}, {"version": "v0.14.0"}, {"version": "v0.13.33"}, {"version": "v0.13.0"}, {"version": "v0.12.9"}, {"version": "v0.12.0"}, {"version": "v0.11.3"}, {"version": "v0.11.2"}, {"version": "v0.11.1"}, {"version": "v0.11.0"}, {"version": "v0.10.5"}, {"version": "v0.10.4"}, {"version": "v0.10.3"}, {"version": "v0.10.2"}, {"version": "v0.10.1"}, {"version": "v0.10.0"}] \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index ed4a1a6f7ee..2ea17bc4b50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ elasticsearch = {version = ">=7.10.1", optional = true } smart-open = {version = ">=6.3.0", extras = ["s3"], optional = true} jina-hubble-sdk = {version = ">=0.34.0", optional = true} elastic-transport = {version ="^8.4.0", optional = true } -qdrant-client = {version = ">=1.1.4", python = "<3.12", optional = true } +version = '0.30.0.dev218.dev218.dev218.dev218.dev218.dev218.dev218.dev218' [tool.poetry.extras] proto = ["protobuf", "lz4"] diff --git a/scripts/release.sh b/scripts/release.sh index 3dd0e4847b2..a3f10f31d19 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -9,8 +9,8 @@ set -ex INIT_FILE='docarray/__init__.py' PYPROJECT_FILE='pyproject.toml' -VER_TAG_PYPROJECT='version = ' -VER_TAG="__version__ = '0." +VER_TAG_PYPROJECT="version = " +VER_TAG="__version__ = " RELEASENOTE='./node_modules/.bin/git-release-notes' function escape_slashes { @@ -27,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 @@ -35,10 +45,10 @@ function clean_build { } function pub_pypi { - publish to pypi - clean_build - poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD - poetry publish --build +# publish to pypi +# clean_build +# poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD +# poetry publish --build clean_build } @@ -90,7 +100,10 @@ if [[ $1 == "final" ]]; then VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" - update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_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" @@ -108,7 +121,10 @@ elif [[ $1 == 'rc' ]]; then VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" - update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_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" @@ -121,7 +137,9 @@ else VER_TAG_NEXT=$VER_TAG\'${NEXT_VER}\' update_ver_line "$VER_TAG" "$VER_TAG_NEXT" "$INIT_FILE" - update_ver_line "$VER_TAG_PYPROJECT" "$VER_TAG_NEXT" "$PYPROJECT_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 From 3fb4b81ea7e823f8d7a762e5a934341d998b2592 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:27:38 +0200 Subject: [PATCH 3/9] chore: fix pyporject version ipdate Signed-off-by: samsja --- .github/workflows/cd.yml | 7 ++++--- .github/workflows/ci.yml | 4 ++-- pyproject.toml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7954cf24f5c..9cab394e350 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,12 +4,13 @@ on: push: branches: - main + - chore-fix-prerelease jobs: - success-all-test: - uses: ./.github/workflows/ci.yml +# success-all-test: +# uses: ./.github/workflows/ci.yml prerelease: - needs: [success-all-test] +# needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50bd5ed2b85..592bd633769 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: inputs: config-path: type: string - pull_request: - types: [opened, synchronize, reopened] +# pull_request: +# types: [opened, synchronize, reopened] jobs: diff --git a/pyproject.toml b/pyproject.toml index 2ea17bc4b50..10099b16750 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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'] From 7fd39aad53a37a141bd5413312710f20cee2c4d8 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:29:35 +0200 Subject: [PATCH 4/9] chore: fix pyporject version ipdate Signed-off-by: samsja --- docs/_versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_versions.json b/docs/_versions.json index 9e92cd69930..7f917611e51 100644 --- a/docs/_versions.json +++ b/docs/_versions.json @@ -1 +1 @@ -[{"version": "v0.30.0"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218.dev218"}, {"version": "v0.30.0.dev218.dev218"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.30.0.dev218"}, {"version": "v0.30.0"}, {"version": "v0.21.0"}, {"version": "v0.20.1"}, {"version": "v0.20.0"}, {"version": "v0.19.0"}, {"version": "v0.18.1"}, {"version": "v0.18.0"}, {"version": "v0.17.0"}, {"version": "v0.16.5"}, {"version": "v0.16.4"}, {"version": "v0.16.3"}, {"version": "v0.16.2"}, {"version": "v0.16.1"}, {"version": "v0.16.0"}, {"version": "v0.15.4"}, {"version": "v0.15.3"}, {"version": "v0.15.2"}, {"version": "v0.15.1"}, {"version": "v0.15.0"}, {"version": "v0.14.11"}, {"version": "v0.14.10"}, {"version": "v0.14.9"}, {"version": "v0.14.8"}, {"version": "v0.14.7"}, {"version": "v0.14.6"}, {"version": "v0.14.5"}, {"version": "v0.14.4"}, {"version": "v0.14.3"}, {"version": "v0.14.2"}, {"version": "v0.14.1"}, {"version": "v0.14.0"}, {"version": "v0.13.33"}, {"version": "v0.13.0"}, {"version": "v0.12.9"}, {"version": "v0.12.0"}, {"version": "v0.11.3"}, {"version": "v0.11.2"}, {"version": "v0.11.1"}, {"version": "v0.11.0"}, {"version": "v0.10.5"}, {"version": "v0.10.4"}, {"version": "v0.10.3"}, {"version": "v0.10.2"}, {"version": "v0.10.1"}, {"version": "v0.10.0"}] \ No newline at end of file +[{"version": "v0.21.0"}, {"version": "v0.20.1"}, {"version": "v0.20.0"}, {"version": "v0.19.0"}, {"version": "v0.18.1"}, {"version": "v0.18.0"}, {"version": "v0.17.0"}, {"version": "v0.16.5"}, {"version": "v0.16.4"}, {"version": "v0.16.3"}, {"version": "v0.16.2"}, {"version": "v0.16.1"}, {"version": "v0.16.0"}, {"version": "v0.15.4"}, {"version": "v0.15.3"}, {"version": "v0.15.2"}, {"version": "v0.15.1"}, {"version": "v0.15.0"}, {"version": "v0.14.11"}, {"version": "v0.14.10"}, {"version": "v0.14.9"}, {"version": "v0.14.8"}, {"version": "v0.14.7"}, {"version": "v0.14.6"}, {"version": "v0.14.5"}, {"version": "v0.14.4"}, {"version": "v0.14.3"}, {"version": "v0.14.2"}, {"version": "v0.14.1"}, {"version": "v0.14.0"}, {"version": "v0.13.33"}, {"version": "v0.13.0"}, {"version": "v0.12.9"}, {"version": "v0.12.0"}, {"version": "v0.11.3"}, {"version": "v0.11.2"}, {"version": "v0.11.1"}, {"version": "v0.11.0"}, {"version": "v0.10.5"}, {"version": "v0.10.4"}, {"version": "v0.10.3"}, {"version": "v0.10.2"}, {"version": "v0.10.1"}, {"version": "v0.10.0"}] \ No newline at end of file From d18928b6d7caab9f7419be8daa2ff557ce1a9d19 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:34:56 +0200 Subject: [PATCH 5/9] chore: fix ready to merge Signed-off-by: samsja --- .github/workflows/cd.yml | 7 +++---- .github/workflows/ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9cab394e350..7954cf24f5c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,13 +4,12 @@ on: push: branches: - main - - chore-fix-prerelease jobs: -# success-all-test: -# uses: ./.github/workflows/ci.yml + success-all-test: + uses: ./.github/workflows/ci.yml prerelease: -# needs: [success-all-test] + needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de3f5730a5a..ea673567d77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: inputs: config-path: type: string -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] jobs: From 8681d40fe291b215484d6e2ce2f45316cbb10af8 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:35:33 +0200 Subject: [PATCH 6/9] Revert "chore: fix ready to merge" This reverts commit d18928b6d7caab9f7419be8daa2ff557ce1a9d19. --- .github/workflows/cd.yml | 7 ++++--- .github/workflows/ci.yml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7954cf24f5c..9cab394e350 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,12 +4,13 @@ on: push: branches: - main + - chore-fix-prerelease jobs: - success-all-test: - uses: ./.github/workflows/ci.yml +# success-all-test: +# uses: ./.github/workflows/ci.yml prerelease: - needs: [success-all-test] +# needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea673567d77..de3f5730a5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: inputs: config-path: type: string - pull_request: - types: [opened, synchronize, reopened] +# pull_request: +# types: [opened, synchronize, reopened] jobs: From f6e6e4804215912b5857d0f5f1d10b26242fa179 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:36:22 +0200 Subject: [PATCH 7/9] chore: fix remove bug Signed-off-by: samsja --- pyproject.toml | 2 +- scripts/release.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10099b16750..f554bdfc4c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ elasticsearch = {version = ">=7.10.1", optional = true } smart-open = {version = ">=6.3.0", extras = ["s3"], optional = true} jina-hubble-sdk = {version = ">=0.34.0", optional = true} elastic-transport = {version ="^8.4.0", optional = true } -version = '0.30.0.dev218.dev218.dev218.dev218.dev218.dev218.dev218.dev218' +qdrant-client = {version = ">=1.1.4", python = "<3.12", optional = true } [tool.poetry.extras] proto = ["protobuf", "lz4"] diff --git a/scripts/release.sh b/scripts/release.sh index a3f10f31d19..05401be4129 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -45,10 +45,10 @@ function clean_build { } function pub_pypi { -# publish to pypi -# clean_build -# poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD -# poetry publish --build + publish to pypi + clean_build + poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD + poetry publish --build clean_build } From c031dbc095562817d7918a99d0366c2886425da6 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:42:00 +0200 Subject: [PATCH 8/9] chore: fix remove bug Signed-off-by: samsja --- scripts/release.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 05401be4129..03f492674b5 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -45,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 From d422145fbcad583c39b6360680e05a1699e57018 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 16:46:05 +0200 Subject: [PATCH 9/9] chore: fix ready to merge Signed-off-by: samsja --- .github/workflows/cd.yml | 6 +++--- .github/workflows/ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9cab394e350..4c9dc0e322d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -7,10 +7,10 @@ on: - chore-fix-prerelease jobs: -# success-all-test: -# uses: ./.github/workflows/ci.yml + success-all-test: + uses: ./.github/workflows/ci.yml prerelease: -# needs: [success-all-test] + needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de3f5730a5a..ea673567d77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: inputs: config-path: type: string -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] jobs: