From 974c702143afcceb01b92be04be1cf9282dd940b Mon Sep 17 00:00:00 2001 From: AleksanderWWW Date: Wed, 4 Oct 2023 12:13:36 +0200 Subject: [PATCH 1/3] bump boto3 required version --- .github/workflows/e2e.yml | 238 +++++++++++++++++++------------------- pyproject.toml | 2 +- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 3a7430d3f..2b972d552 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -6,8 +6,8 @@ on: schedule: - cron: "0 4 * * *" # Run every day at arbitrary time (4:00 AM UTC) push: - branches: - - master +# branches: +# - master env: WORKSPACE_NAME: e2e-tests @@ -18,107 +18,107 @@ env: SERVICE_ACCOUNT_NAME: ${{ secrets.E2E_SERVICE_ACCOUNT_NAME }} jobs: - e2e: - timeout-minutes: 75 - strategy: - fail-fast: false - matrix: - python-version: [ "3.7", "3.10" ] - os: [ ubuntu, windows ] - include: - - python-version: "3.7.16" - os: macos - - python-version: "3.10" - os: macos - runs-on: ${{ matrix.os }}-latest - name: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.pull_request.head.ref }} - - - name: Test - uses: ./.github/actions/test-e2e - env: - NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} - with: - python-version: ${{ matrix.python-version }} - os: ${{ matrix.os }} - module: "not s3 and not integrations" - name: "standard" - report_job: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' - codecov-token: ${{ secrets.CODECOV_TOKEN }} - - e2e_management: - timeout-minutes: 75 - strategy: - fail-fast: false - matrix: - python-version: [ "3.7", "3.10" ] - os: [ ubuntu, windows ] - include: - - python-version: "3.7.16" - os: macos - - python-version: "3.10" - os: macos - runs-on: ${{ matrix.os }}-latest - name: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.pull_request.head.ref }} - - - name: Test - uses: ./.github/actions/test-e2e - env: - NEPTUNE_API_TOKEN: ${{secrets.E2E_NEPTUNE_API_TOKEN}} - with: - python-version: ${{ matrix.python-version }} - os: ${{ matrix.os }} - module: management - name: management - report_job: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' - codecov-token: ${{ secrets.CODECOV_TOKEN }} - - e2e_s3_gcs: - timeout-minutes: 75 - strategy: - fail-fast: false - matrix: - python-version: [ "3.7", "3.10" ] - os: [ ubuntu, windows ] - include: - - python-version: "3.7.16" - os: macos - - python-version: "3.10" - os: macos - runs-on: ${{ matrix.os }}-latest - name: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.pull_request.head.ref }} - - - name: Test - uses: ./.github/actions/test-e2e - env: - NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} - AWS_ACCESS_KEY_ID: ${{secrets.E2E_GCS_ACCESS_KEY_ID}} - AWS_SECRET_ACCESS_KEY: ${{secrets.E2E_GCS_SECRET_ACCESS_KEY}} - S3_ENDPOINT_URL: "https://storage.googleapis.com/" - with: - python-version: ${{ matrix.python-version }} - os: ${{ matrix.os }} - module: s3 - name: s3-gcs - report_job: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' - codecov-token: ${{ secrets.CODECOV_TOKEN }} +# e2e: +# timeout-minutes: 75 +# strategy: +# fail-fast: false +# matrix: +# python-version: [ "3.7", "3.10" ] +# os: [ ubuntu, windows ] +# include: +# - python-version: "3.7.16" +# os: macos +# - python-version: "3.10" +# os: macos +# runs-on: ${{ matrix.os }}-latest +# name: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' +# steps: +# - name: Checkout repository +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# ref: ${{ github.event.client_payload.pull_request.head.ref }} +# +# - name: Test +# uses: ./.github/actions/test-e2e +# env: +# NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} +# with: +# python-version: ${{ matrix.python-version }} +# os: ${{ matrix.os }} +# module: "not s3 and not integrations" +# name: "standard" +# report_job: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' +# codecov-token: ${{ secrets.CODECOV_TOKEN }} +# +# e2e_management: +# timeout-minutes: 75 +# strategy: +# fail-fast: false +# matrix: +# python-version: [ "3.7", "3.10" ] +# os: [ ubuntu, windows ] +# include: +# - python-version: "3.7.16" +# os: macos +# - python-version: "3.10" +# os: macos +# runs-on: ${{ matrix.os }}-latest +# name: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' +# steps: +# - name: Checkout repository +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# ref: ${{ github.event.client_payload.pull_request.head.ref }} +# +# - name: Test +# uses: ./.github/actions/test-e2e +# env: +# NEPTUNE_API_TOKEN: ${{secrets.E2E_NEPTUNE_API_TOKEN}} +# with: +# python-version: ${{ matrix.python-version }} +# os: ${{ matrix.os }} +# module: management +# name: management +# report_job: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' +# codecov-token: ${{ secrets.CODECOV_TOKEN }} +# +# e2e_s3_gcs: +# timeout-minutes: 75 +# strategy: +# fail-fast: false +# matrix: +# python-version: [ "3.7", "3.10" ] +# os: [ ubuntu, windows ] +# include: +# - python-version: "3.7.16" +# os: macos +# - python-version: "3.10" +# os: macos +# runs-on: ${{ matrix.os }}-latest +# name: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' +# steps: +# - name: Checkout repository +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# ref: ${{ github.event.client_payload.pull_request.head.ref }} +# +# - name: Test +# uses: ./.github/actions/test-e2e +# env: +# NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} +# AWS_ACCESS_KEY_ID: ${{secrets.E2E_GCS_ACCESS_KEY_ID}} +# AWS_SECRET_ACCESS_KEY: ${{secrets.E2E_GCS_SECRET_ACCESS_KEY}} +# S3_ENDPOINT_URL: "https://storage.googleapis.com/" +# with: +# python-version: ${{ matrix.python-version }} +# os: ${{ matrix.os }} +# module: s3 +# name: s3-gcs +# report_job: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' +# codecov-token: ${{ secrets.CODECOV_TOKEN }} e2e_s3: timeout-minutes: 75 @@ -154,19 +154,19 @@ jobs: name: s3 report_job: 's3 (${{ matrix.os }} - py${{ matrix.python-version }})' codecov-token: ${{ secrets.CODECOV_TOKEN }} - - e2e-tests-notify: - needs: [ e2e, e2e_management, e2e_s3_gcs, e2e_s3 ] - runs-on: ubuntu-latest - if: (success() || failure()) && github.ref == 'refs/heads/master' - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.client_payload.pull_request.head.ref }} - - - name: Notify - uses: ./.github/actions/workflow-notify - with: - slack-webhook: ${{ secrets.E2E_REGULAR_SLACK_WEBHOOK }} +# +# e2e-tests-notify: +# needs: [ e2e, e2e_management, e2e_s3_gcs, e2e_s3 ] +# runs-on: ubuntu-latest +# if: (success() || failure()) && github.ref == 'refs/heads/master' +# steps: +# - name: Checkout repository +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# ref: ${{ github.event.client_payload.pull_request.head.ref }} +# +# - name: Notify +# uses: ./.github/actions/workflow-notify +# with: +# slack-webhook: ${{ secrets.E2E_REGULAR_SLACK_WEBHOOK }} diff --git a/pyproject.toml b/pyproject.toml index e95c55b8a..471b8fc6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ urllib3 = "*" swagger-spec-validator = ">=2.7.4" # Built-in integrations -boto3 = ">=1.16.0" +boto3 = ">=1.28.0" Pillow = ">=1.1.6" GitPython = ">=2.0.8" psutil = "*" From bd6817428dc54b2d884bc6dd940a4679db98cbaa Mon Sep 17 00:00:00 2001 From: AleksanderWWW Date: Wed, 4 Oct 2023 12:27:53 +0200 Subject: [PATCH 2/3] uncomment --- .github/workflows/e2e.yml | 238 +++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2b972d552..3a7430d3f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -6,8 +6,8 @@ on: schedule: - cron: "0 4 * * *" # Run every day at arbitrary time (4:00 AM UTC) push: -# branches: -# - master + branches: + - master env: WORKSPACE_NAME: e2e-tests @@ -18,107 +18,107 @@ env: SERVICE_ACCOUNT_NAME: ${{ secrets.E2E_SERVICE_ACCOUNT_NAME }} jobs: -# e2e: -# timeout-minutes: 75 -# strategy: -# fail-fast: false -# matrix: -# python-version: [ "3.7", "3.10" ] -# os: [ ubuntu, windows ] -# include: -# - python-version: "3.7.16" -# os: macos -# - python-version: "3.10" -# os: macos -# runs-on: ${{ matrix.os }}-latest -# name: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' -# steps: -# - name: Checkout repository -# uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# ref: ${{ github.event.client_payload.pull_request.head.ref }} -# -# - name: Test -# uses: ./.github/actions/test-e2e -# env: -# NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} -# with: -# python-version: ${{ matrix.python-version }} -# os: ${{ matrix.os }} -# module: "not s3 and not integrations" -# name: "standard" -# report_job: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' -# codecov-token: ${{ secrets.CODECOV_TOKEN }} -# -# e2e_management: -# timeout-minutes: 75 -# strategy: -# fail-fast: false -# matrix: -# python-version: [ "3.7", "3.10" ] -# os: [ ubuntu, windows ] -# include: -# - python-version: "3.7.16" -# os: macos -# - python-version: "3.10" -# os: macos -# runs-on: ${{ matrix.os }}-latest -# name: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' -# steps: -# - name: Checkout repository -# uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# ref: ${{ github.event.client_payload.pull_request.head.ref }} -# -# - name: Test -# uses: ./.github/actions/test-e2e -# env: -# NEPTUNE_API_TOKEN: ${{secrets.E2E_NEPTUNE_API_TOKEN}} -# with: -# python-version: ${{ matrix.python-version }} -# os: ${{ matrix.os }} -# module: management -# name: management -# report_job: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' -# codecov-token: ${{ secrets.CODECOV_TOKEN }} -# -# e2e_s3_gcs: -# timeout-minutes: 75 -# strategy: -# fail-fast: false -# matrix: -# python-version: [ "3.7", "3.10" ] -# os: [ ubuntu, windows ] -# include: -# - python-version: "3.7.16" -# os: macos -# - python-version: "3.10" -# os: macos -# runs-on: ${{ matrix.os }}-latest -# name: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' -# steps: -# - name: Checkout repository -# uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# ref: ${{ github.event.client_payload.pull_request.head.ref }} -# -# - name: Test -# uses: ./.github/actions/test-e2e -# env: -# NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} -# AWS_ACCESS_KEY_ID: ${{secrets.E2E_GCS_ACCESS_KEY_ID}} -# AWS_SECRET_ACCESS_KEY: ${{secrets.E2E_GCS_SECRET_ACCESS_KEY}} -# S3_ENDPOINT_URL: "https://storage.googleapis.com/" -# with: -# python-version: ${{ matrix.python-version }} -# os: ${{ matrix.os }} -# module: s3 -# name: s3-gcs -# report_job: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' -# codecov-token: ${{ secrets.CODECOV_TOKEN }} + e2e: + timeout-minutes: 75 + strategy: + fail-fast: false + matrix: + python-version: [ "3.7", "3.10" ] + os: [ ubuntu, windows ] + include: + - python-version: "3.7.16" + os: macos + - python-version: "3.10" + os: macos + runs-on: ${{ matrix.os }}-latest + name: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.client_payload.pull_request.head.ref }} + + - name: Test + uses: ./.github/actions/test-e2e + env: + NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} + with: + python-version: ${{ matrix.python-version }} + os: ${{ matrix.os }} + module: "not s3 and not integrations" + name: "standard" + report_job: 'standard (${{ matrix.os }} - py${{ matrix.python-version }})' + codecov-token: ${{ secrets.CODECOV_TOKEN }} + + e2e_management: + timeout-minutes: 75 + strategy: + fail-fast: false + matrix: + python-version: [ "3.7", "3.10" ] + os: [ ubuntu, windows ] + include: + - python-version: "3.7.16" + os: macos + - python-version: "3.10" + os: macos + runs-on: ${{ matrix.os }}-latest + name: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.client_payload.pull_request.head.ref }} + + - name: Test + uses: ./.github/actions/test-e2e + env: + NEPTUNE_API_TOKEN: ${{secrets.E2E_NEPTUNE_API_TOKEN}} + with: + python-version: ${{ matrix.python-version }} + os: ${{ matrix.os }} + module: management + name: management + report_job: 'management (${{ matrix.os }} - py${{ matrix.python-version }})' + codecov-token: ${{ secrets.CODECOV_TOKEN }} + + e2e_s3_gcs: + timeout-minutes: 75 + strategy: + fail-fast: false + matrix: + python-version: [ "3.7", "3.10" ] + os: [ ubuntu, windows ] + include: + - python-version: "3.7.16" + os: macos + - python-version: "3.10" + os: macos + runs-on: ${{ matrix.os }}-latest + name: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.client_payload.pull_request.head.ref }} + + - name: Test + uses: ./.github/actions/test-e2e + env: + NEPTUNE_API_TOKEN: ${{secrets.E2E_SERVICE_ACCOUNT_API_TOKEN}} + AWS_ACCESS_KEY_ID: ${{secrets.E2E_GCS_ACCESS_KEY_ID}} + AWS_SECRET_ACCESS_KEY: ${{secrets.E2E_GCS_SECRET_ACCESS_KEY}} + S3_ENDPOINT_URL: "https://storage.googleapis.com/" + with: + python-version: ${{ matrix.python-version }} + os: ${{ matrix.os }} + module: s3 + name: s3-gcs + report_job: 's3-gcs (${{ matrix.os }} - py${{ matrix.python-version }})' + codecov-token: ${{ secrets.CODECOV_TOKEN }} e2e_s3: timeout-minutes: 75 @@ -154,19 +154,19 @@ jobs: name: s3 report_job: 's3 (${{ matrix.os }} - py${{ matrix.python-version }})' codecov-token: ${{ secrets.CODECOV_TOKEN }} -# -# e2e-tests-notify: -# needs: [ e2e, e2e_management, e2e_s3_gcs, e2e_s3 ] -# runs-on: ubuntu-latest -# if: (success() || failure()) && github.ref == 'refs/heads/master' -# steps: -# - name: Checkout repository -# uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# ref: ${{ github.event.client_payload.pull_request.head.ref }} -# -# - name: Notify -# uses: ./.github/actions/workflow-notify -# with: -# slack-webhook: ${{ secrets.E2E_REGULAR_SLACK_WEBHOOK }} + + e2e-tests-notify: + needs: [ e2e, e2e_management, e2e_s3_gcs, e2e_s3 ] + runs-on: ubuntu-latest + if: (success() || failure()) && github.ref == 'refs/heads/master' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.client_payload.pull_request.head.ref }} + + - name: Notify + uses: ./.github/actions/workflow-notify + with: + slack-webhook: ${{ secrets.E2E_REGULAR_SLACK_WEBHOOK }} From 9da26ccf6336bd35f8fee5b048b75801273b8bf1 Mon Sep 17 00:00:00 2001 From: AleksanderWWW Date: Wed, 4 Oct 2023 12:44:20 +0200 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9624f5a26..cd072ecd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Add newline at the end of generated `.patch` while tracking uncommitted changes ([#1473](https://github.com/neptune-ai/neptune-client/pull/1473)) - Clarify `NeptuneLimitExceedException` error message ([#1480](https://github.com/neptune-ai/neptune-client/pull/1480)) +### Changes +- Bump boto3 required version to speed up installation via poetry ([#1481](https://github.com/neptune-ai/neptune-client/pull/1481)) + ## neptune 1.7.0 ### Features