From 870aa9148d9247426cbac4c773d31ff83ce8732b Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Mon, 18 Nov 2019 10:31:10 +0100 Subject: [PATCH 01/16] Removed parallelization limit. --- .github/workflows/testing.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index dc442558..83f2e00c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -31,7 +31,6 @@ jobs: matrix: python: ['3.6', '3.7', '3.8' ] librdkafka: ['1.1.0'] - max-parallel: 1 steps: - uses: actions/checkout@v1 - name: Fetch virtualenv cache From af4d42cbecb2932394b16b188eb2990efd0aa356 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Mon, 18 Nov 2019 11:19:27 +0100 Subject: [PATCH 02/16] Release test. --- .github/workflows/publish.yml | 62 +++++++++++++++++++ .../{release.yml => release-prep.yml} | 58 +++++++---------- 2 files changed, 83 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/publish.yml rename .github/workflows/{release.yml => release-prep.yml} (61%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..91c45d02 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,62 @@ +name: Publish esque +on: + push: + branches: + - master + tags: + - v* + +jobs: + publish-to-pypi: + name: Publish to pypi + runs-on: ubuntu-latest + steps: + - name: Checkout branch + uses: actions/checkout@v1 + - name: Setup python and install packages + uses: actions/setup-python@v1 + with: + python-version: '3.6' + architecture: x64 + - name: Prepare environment for publish + if: success() + run: | + pip install "poetry==1.0.0b3" + poetry config repositories.testpypi http://test.pypi.org/legacy + - name: Publish to test pypi + if: success() && github.event_name == 'push' + run: | + export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) + poetry build + poetry publish --repository testpypi --username "${{ secrets.TEST_PYPI_USER }}" --password "${{ secrets.TEST_PYPI_PASSWORD }}" + - name: Test the testpypi release + if: success() + run: | + export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) + pushd /tmp + pip install -i http://test.pypi.org/legacy --timeout 60 esque==${VERSION} + esque --help + popd +# - name: Publish to pypi +# if: success() && github.event_name == 'push' +# run: | +# export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) +# poetry build +# poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}" + draft-release: + name: Draft release + needs: [ publish-to-pypi ] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v1 + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: 'true' + prerelease: 'true' diff --git a/.github/workflows/release.yml b/.github/workflows/release-prep.yml similarity index 61% rename from .github/workflows/release.yml rename to .github/workflows/release-prep.yml index 6f34eb81..c6eaeb73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release-prep.yml @@ -1,18 +1,16 @@ -name: Publish esque +name: Verify release on: push: branches: - - release - pull_request: - branches: - - release + - release-prep jobs: - publish-to-pypi: - name: Publish to pypi + check-version-change: + name: Check version change runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - name: Checkout branch + uses: actions/checkout@v1 - name: Setup python and install packages uses: actions/setup-python@v1 with: @@ -30,6 +28,17 @@ jobs: done echo "The version (${VERSION}) does not match any of the tags (${LATEST_TAGS})" exit 1) + publish-to-devpi: + name: Publish to devpi + runs-on: ubuntu-latest + steps: + - name: Checkout branch + uses: actions/checkout@v1 + - name: Setup python and install packages + uses: actions/setup-python@v1 + with: + python-version: '3.6' + architecture: x64 - name: Prepare environment for test publish if: success() run: | @@ -50,34 +59,9 @@ jobs: export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) poetry build poetry publish --repository devpi --username root --password root + - name: Test devpi release + if: success() + run: | + cd /tmp pip install -i http://localhost:3141/root/stable/ --timeout 60 esque==${VERSION} esque --help - - name: Publish to test pypi - if: success() && github.event_name == 'push' - run: | - export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) - poetry build - poetry publish --repository devpi --username "${{ secrets.TEST_PYPI_USER }}" --password "${{ secrets.TEST_PYPI_PASSWORD }}" - - name: Publish to pypi - if: success() && github.event_name == 'push' - run: | - export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) - poetry build - poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}" - draft-release: - name: Draft release - needs: [ publish-to-pypi ] - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v1 - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: 'true' - prerelease: 'true' From 9d5bc973f2e6568eb2ad9352840ac8de83bb4e80 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Mon, 18 Nov 2019 11:25:05 +0100 Subject: [PATCH 03/16] Uncomment the publishing step. --- .github/workflows/publish.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 91c45d02..23ab34de 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,12 +37,12 @@ jobs: pip install -i http://test.pypi.org/legacy --timeout 60 esque==${VERSION} esque --help popd -# - name: Publish to pypi -# if: success() && github.event_name == 'push' -# run: | -# export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) -# poetry build -# poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}" + - name: Publish to pypi + if: success() && github.event_name == 'push' + run: | + export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) + poetry build + poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}" draft-release: name: Draft release needs: [ publish-to-pypi ] From 189adf6dcfe5733a53a2d9ffb22088c9243666a0 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:14:22 +0100 Subject: [PATCH 04/16] Version changed to 0.2.0b0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d3d24918..bd3f7581 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.0-alpha.0" +version = "0.2.0b0" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From 08854d432454827bc68e8274a422d8034d68f885 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:16:25 +0100 Subject: [PATCH 05/16] Removed the tag check. --- .github/workflows/release-prep.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index c6eaeb73..a0579f7f 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -19,15 +19,7 @@ jobs: - name: Check version change run: | VERSION="$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml)" - LATEST_TAGS="$(git tag -l --points-at HEAD)" ! pip3 install esque==blork 2>&1 | grep -oE "${VERSION}($|,)" - (for tag in ${LATEST_TAGS}; do - if test "${tag}" == "v${VERSION}"; then - exit 0 - fi - done - echo "The version (${VERSION}) does not match any of the tags (${LATEST_TAGS})" - exit 1) publish-to-devpi: name: Publish to devpi runs-on: ubuntu-latest From 7c90602798408d0bce65504648f62d462719d7b2 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:20:30 +0100 Subject: [PATCH 06/16] Workflow optimizations. --- .github/workflows/publish.yml | 7 +------ .github/workflows/release-prep.yml | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2eea3c27..ae6b6dff 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,14 +16,9 @@ jobs: with: python-version: '3.6' architecture: x64 - - name: Prepare environment for publish - if: success() - run: | - pip install "poetry==1.0.0b3" - poetry config repositories.testpypi http://test.pypi.org/legacy - name: Publish to pypi if: success() run: | - export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) + pip install "poetry==1.0.0b3" poetry build poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}" diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index a0579f7f..e232db49 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -48,12 +48,13 @@ jobs: - name: Publish to devpi if: success() run: | - export VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) poetry build poetry publish --repository devpi --username root --password root - name: Test devpi release if: success() run: | + VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) cd /tmp - pip install -i http://localhost:3141/root/stable/ --timeout 60 esque==${VERSION} + pip install -i http://localhost:3141/root/stable/ --timeout 60 esque esque --help + [[ $(esque --version) == ${VERSION} ]] \ No newline at end of file From b081b7a78e4e3e0d170c2f7346a42984570df726 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:28:07 +0100 Subject: [PATCH 07/16] Modified the version test. --- .github/workflows/release-prep.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index e232db49..dec13b71 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -57,4 +57,5 @@ jobs: cd /tmp pip install -i http://localhost:3141/root/stable/ --timeout 60 esque esque --help - [[ $(esque --version) == ${VERSION} ]] \ No newline at end of file + CURRENT_VERSION=$(esque --version | awk '{print $3}') + [[ ${CURRENT_VERSION} == \"${VERSION}\" ]] \ No newline at end of file From f31638c0f86f5dfcb2216afaa872725b2b6092b2 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:34:57 +0100 Subject: [PATCH 08/16] Modified the version test. --- .github/workflows/release-prep.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index dec13b71..db84e487 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -53,9 +53,10 @@ jobs: - name: Test devpi release if: success() run: | + ! which esque VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml) cd /tmp pip install -i http://localhost:3141/root/stable/ --timeout 60 esque esque --help CURRENT_VERSION=$(esque --version | awk '{print $3}') - [[ ${CURRENT_VERSION} == \"${VERSION}\" ]] \ No newline at end of file + [[ ${CURRENT_VERSION} == ${VERSION} ]] \ No newline at end of file From 9433bc6c84497d1d76d9a56f1a75cf6341ef5275 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 19 Nov 2019 10:40:46 +0100 Subject: [PATCH 09/16] Changed the development status classifier --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bd3f7581..9ba5edf9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ repository = "https://github.com/real.digital/esque" keywords = ["kafka", "cli", "commandline", "administration", "operation"] classifiers = [ - "Development Status :: 3 - Alpha", + "Development Status :: 4 - Beta", "Intended Audience :: System Administrators and Developers", "Topic :: System Administration :: Operational Tools", "License :: OSI Approved :: MIT License", From bad9cffc814160744c4a9c6bb1ae0f84e88e24c6 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 6 Oct 2020 11:54:48 +0200 Subject: [PATCH 10/16] Version changed to v0.2.3a1 --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36467dbb..5d4360e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### Version 0.2.3a1 +* Converted unserializable values to strings when writing to STDOUT ### Version 0.2.2 * Consume option renamed from `numbers` to `number`. * Add `edit offsets` command. diff --git a/pyproject.toml b/pyproject.toml index 5d85a5cf..9e2bcd4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.2" +version = "0.2.3a1" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From 81a5220f1059a810df73dfb99893f7064bb08b1b Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Wed, 7 Oct 2020 09:07:19 +0200 Subject: [PATCH 11/16] Version changed to v0.2.3 --- CHANGELOG.md | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d4360e0..f9f2f5d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### Version 0.2.3a1 +### Version 0.2.3 * Converted unserializable values to strings when writing to STDOUT ### Version 0.2.2 * Consume option renamed from `numbers` to `number`. diff --git a/pyproject.toml b/pyproject.toml index 9e2bcd4c..103fe67d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.3a1" +version = "0.2.3" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From 2251a57e6943e4259b156e6ef76ca9f3626258ec Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Mon, 19 Oct 2020 12:49:40 +0200 Subject: [PATCH 12/16] Version 0.2.4 released. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f2f5d6..a8ef0233 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### Version 0.2.4 +* Add `delete consumergroup` command. ### Version 0.2.3 * Converted unserializable values to strings when writing to STDOUT ### Version 0.2.2 From 2270f0052986971cb2b25c3f2c7d6e14bd40d408 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Tue, 27 Oct 2020 10:34:53 +0100 Subject: [PATCH 13/16] Version changed to v0.2.5" --- CHANGELOG.md | 3 +++ pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ef0233..b23528f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### Version 0.2.5 +* Enable support for variadic arguments when deleting topics and consumer groups. +* Enable piping in arguments when deleting topics and consumer groups. ### Version 0.2.4 * Add `delete consumergroup` command. ### Version 0.2.3 diff --git a/pyproject.toml b/pyproject.toml index 799c62e2..3467aca3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.4" +version = "0.2.5" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From 7d1c9e6beb9b78cb2358c692fd976d41ddadf0ab Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Wed, 11 Nov 2020 15:56:39 +0100 Subject: [PATCH 14/16] Version changed to v0.2.6 --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b23528f0..ba5c2f53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### Version 0.2.6 +* Enabled listing internal topics by default. Added `--hide-internal` flag to `get topics` command. ### Version 0.2.5 * Enable support for variadic arguments when deleting topics and consumer groups. * Enable piping in arguments when deleting topics and consumer groups. diff --git a/pyproject.toml b/pyproject.toml index 3467aca3..b7662334 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.5" +version = "0.2.6" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From 40a2361055b85509d1ed5a13bbfc3bdc29a28606 Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Wed, 25 Nov 2020 15:34:30 +0100 Subject: [PATCH 15/16] Version changed to v0.2.7 --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5c2f53..b4bd6d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### Version 0.2.7 +* Exit with code 1 when `apply` tries to change the number of partitions or the replication factor for a topic. ### Version 0.2.6 * Enabled listing internal topics by default. Added `--hide-internal` flag to `get topics` command. ### Version 0.2.5 diff --git a/pyproject.toml b/pyproject.toml index b7662334..58c82e18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.6" +version = "0.2.7" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT" From b792f1489fb6776253219eacf1483ce9bb11b13b Mon Sep 17 00:00:00 2001 From: ognjen-j Date: Thu, 3 Dec 2020 16:40:30 +0100 Subject: [PATCH 16/16] Version changed to v0.2.8 --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4bd6d0f..48402b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### Version 0.2.8 +* Updated avro-python3 to version 1.10.0 ### Version 0.2.7 * Exit with code 1 when `apply` tries to change the number of partitions or the replication factor for a topic. ### Version 0.2.6 diff --git a/pyproject.toml b/pyproject.toml index 303bbcd5..bfd028d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "esque" -version = "0.2.7" +version = "0.2.8" description="esque - an operational kafka tool." authors = ["real.digital "] license = "MIT"