From 3343ef253ad5280f747c3fb4d44b167eccd0b1f4 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 13:48:47 +0200 Subject: [PATCH 01/10] chore: make script runable Signed-off-by: samsja --- .github/workflows/cd.yml | 7 ++++--- .github/workflows/ci.yml | 4 ++-- scripts/release.sh | 0 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 scripts/release.sh diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index cf99226cede..3e61851340c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,12 +4,13 @@ on: push: branches: - main + - chore-debug-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/scripts/release.sh b/scripts/release.sh old mode 100644 new mode 100755 From 86333cb385f88b9d405ee78ee02fcf55de8f359b Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:00:29 +0200 Subject: [PATCH 02/10] chore: add missing script Signed-off-by: samsja --- scripts/prepend_version_json.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 scripts/prepend_version_json.py diff --git a/scripts/prepend_version_json.py b/scripts/prepend_version_json.py new file mode 100644 index 00000000000..8b66c9979b9 --- /dev/null +++ b/scripts/prepend_version_json.py @@ -0,0 +1,21 @@ +import argparse +import json +from typing import List + +parser = argparse.ArgumentParser(prog="Prepender docs/_versions.json") +parser.add_argument( + "--version", + type=str, + help="The version we wish to prepend (e.g. v0.18.0)", + required=True, +) +args = parser.parse_args() + +with open("./docs/_versions.json") as f: + versions: List[dict] = json.load(f) + element = {k: v for k, v in args._get_kwargs()} + if element != versions[0]: + versions.insert(0, element) + +with open("./docs/_versions.json", "w") as f: + json.dump(versions, f) From 5bec196f9e65541beb764dae565acf6aae5fb455 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:03:14 +0200 Subject: [PATCH 03/10] chore: add missing script Signed-off-by: samsja --- docs/_versions.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/_versions.json diff --git a/docs/_versions.json b/docs/_versions.json new file mode 100644 index 00000000000..7f917611e51 --- /dev/null +++ b/docs/_versions.json @@ -0,0 +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 From adc2a3641298cfc04f829612359353ff0fa0301b Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:04:42 +0200 Subject: [PATCH 04/10] chore: add missing script Signed-off-by: samsja --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3e61851340c..faf1cbd72a1 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -19,7 +19,7 @@ jobs: - name: Pre-release (.devN) run: | git fetch --depth=1 origin +refs/tags/*:refs/tags/* - pip install twine wheel + pip install poetry ./scripts/release.sh env: TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} From e7f0c097c50bf46f4d9ebc931e2622edb71b08cd Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:46:55 +0200 Subject: [PATCH 05/10] chore: add passwrod Signed-off-by: samsja --- .github/workflows/cd.yml | 4 ++-- scripts/release.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index faf1cbd72a1..c4292092b8f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -22,8 +22,8 @@ jobs: pip install poetry ./scripts/release.sh env: - TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} - TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} + PYPI_USERNAME: ${{ secrets.TWINE_USERNAME }} + PYPI_PASSWORD: ${{ secrets.TWINE_PASSWORD }} JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} check-readme-modification: diff --git a/scripts/release.sh b/scripts/release.sh index 48a5dd513e9..2208d3fa642 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -35,6 +35,7 @@ function clean_build { function pub_pypi { # publish to pypi clean_build + poetry config http-basic.pypi PYPI_USERNAME PYPI_PASSWORD poetry publish --build clean_build } From 16d480589778942bc358444df67ed7bbbbdcdd22 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:48:49 +0200 Subject: [PATCH 06/10] chore: add passwrod Signed-off-by: samsja --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 2208d3fa642..06f601e9b7e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -35,7 +35,7 @@ function clean_build { function pub_pypi { # publish to pypi clean_build - poetry config http-basic.pypi PYPI_USERNAME PYPI_PASSWORD + poetry config http-basic.pypi $PYPI_USERNAME $PYPI_PASSWORD poetry publish --build clean_build } From b91d75466d5552d45e32952347b17d371e0b6e27 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:57:51 +0200 Subject: [PATCH 07/10] chore: add readme Signed-off-by: samsja --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f200163376e..eea338af6f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "docarray" version = '0.30.0a3' -description='The data structure for unstructured data' +readme = 'README.md' authors=['DocArray'] license='Apache 2.0' From 5ddda55195ec9f2ab890671874eb1f969ab56454 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 14:59:02 +0200 Subject: [PATCH 08/10] chore: add readme Signed-off-by: samsja --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index eea338af6f4..af619c861d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [tool.poetry] name = "docarray" version = '0.30.0a3' +description='The data structure for unstructured data' readme = 'README.md' authors=['DocArray'] license='Apache 2.0' From d9e53a95b94e214c811027acf75d35bd100d6639 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 15:05:36 +0200 Subject: [PATCH 09/10] chore: male pyproject toml better for publishing Signed-off-by: samsja --- pyproject.toml | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index af619c861d3..ed4a1a6f7ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,38 @@ [tool.poetry] name = "docarray" -version = '0.30.0a3' -description='The data structure for unstructured data' +version = '0.30.0a4' +description='The data structure for multimodal data' readme = 'README.md' authors=['DocArray'] license='Apache 2.0' +homepage = "https://docs.docarray.org/" +repository = "https://github.com/docarray/docarray" +documentation = "https://docs.docarray.org/" +keywords = ['docarray', 'deep-learning', 'data-structures cross-modal multi-modal',' unstructured-data',' nested-data','neural-search'] +classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Intended Audience :: Education', + 'Intended Audience :: Science/Research', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Unix Shell', + 'Environment :: Console', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Topic :: Database :: Database Engines/Servers', + 'Topic :: Scientific/Engineering :: Artificial Intelligence', + 'Topic :: Internet :: WWW/HTTP :: Indexing/Search', + 'Topic :: Scientific/Engineering :: Image Recognition', + 'Topic :: Multimedia :: Video', + 'Topic :: Scientific/Engineering', + 'Topic :: Scientific/Engineering :: Mathematics', + 'Topic :: Software Development', + 'Topic :: Software Development :: Libraries', + 'Topic :: Software Development :: Libraries :: Python Modules', +] [tool.poetry.dependencies] python = ">=3.7,<4.0" From 779e708da331544e1498e6fa829555b23cc79d61 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 15:09:08 +0200 Subject: [PATCH 10/10] chore: ready for main 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 c4292092b8f..7954cf24f5c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,13 +4,12 @@ on: push: branches: - main - - chore-debug-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 592bd633769..50bd5ed2b85 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: