From 6074f2b91263ad5697cb7e8c35dff1503a56a0a1 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Thu, 28 Mar 2024 16:40:18 -0700 Subject: [PATCH 1/4] split up workflows --- .github/workflows/python-package-develop.yaml | 37 +++++++++++ .github/workflows/python-package-main.yml | 37 +++++++++++ .github/workflows/python-package.yml | 66 ------------------- 3 files changed, 74 insertions(+), 66 deletions(-) create mode 100644 .github/workflows/python-package-develop.yaml create mode 100644 .github/workflows/python-package-main.yml delete mode 100644 .github/workflows/python-package.yml diff --git a/.github/workflows/python-package-develop.yaml b/.github/workflows/python-package-develop.yaml new file mode 100644 index 000000000..72154f656 --- /dev/null +++ b/.github/workflows/python-package-develop.yaml @@ -0,0 +1,37 @@ +name: Labelbox Python SDK Develop + +on: + push: + branches: [develop] + pull_request: + branches: [develop] + +jobs: + build: + strategy: + fail-fast: false + matrix: + include: + - python-version: 3.8 + api-key: STAGING_LABELBOX_API_KEY_2 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.9 + api-key: STAGING_LABELBOX_API_KEY_3 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: "3.10" + api-key: STAGING_LABELBOX_API_KEY_4 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.11 + api-key: STAGING_LABELBOX_API_KEY + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.12 + api-key: STAGING_LABELBOX_API_KEY_5 + da-test-key: DA_GCP_LABELBOX_API_KEY + uses: ./.github/workflows/python-package-shared.yml + with: + python-version: ${{ matrix.python-version }} + api-key: ${{ matrix.api-key }} + da-test-key: ${{ matrix.da-test-key }} + fixture-profile: true + test-env: 'staging' + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/python-package-main.yml b/.github/workflows/python-package-main.yml new file mode 100644 index 000000000..cf9112172 --- /dev/null +++ b/.github/workflows/python-package-main.yml @@ -0,0 +1,37 @@ +name: Labelbox Python SDK Main + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + build: + strategy: + fail-fast: false + matrix: + include: + - python-version: 3.8 + api-key: PROD_LABELBOX_API_KEY_2 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.9 + api-key: PROD_LABELBOX_API_KEY_3 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: "3.10" + api-key: PROD_LABELBOX_API_KEY_4 + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.11 + api-key: LABELBOX_API_KEY + da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: 3.12 + api-key: PROD_LABELBOX_API_KEY_5 + da-test-key: DA_GCP_LABELBOX_API_KEY + uses: ./.github/workflows/python-package-shared.yml + with: + python-version: ${{ matrix.python-version }} + api-key: ${{ matrix.api-key }} + da-test-key: ${{ matrix.da-test-key }} + fixture-profile: false + test-env: 'prod' + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml deleted file mode 100644 index e4c4c1128..000000000 --- a/.github/workflows/python-package.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Labelbox Python SDK - -on: - push: - branches: [develop, master] - pull_request: - branches: [develop, master] - -jobs: - build-prod: - strategy: - fail-fast: false - matrix: - include: - - python-version: 3.8 - api-key: PROD_LABELBOX_API_KEY_2 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.9 - api-key: PROD_LABELBOX_API_KEY_3 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: "3.10" - api-key: PROD_LABELBOX_API_KEY_4 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.11 - api-key: LABELBOX_API_KEY - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.12 - api-key: PROD_LABELBOX_API_KEY_5 - da-test-key: DA_GCP_LABELBOX_API_KEY - uses: ./.github/workflows/python-package-shared.yml - with: - python-version: ${{ matrix.python-version }} - api-key: ${{ matrix.api-key }} - da-test-key: ${{ matrix.da-test-key }} - fixture-profile: false - test-env: 'prod' - secrets: inherit - build-staging: - if: ${{ github.event_name }} == 'pull_request' - strategy: - fail-fast: false - matrix: - include: - - python-version: 3.8 - api-key: STAGING_LABELBOX_API_KEY_2 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.9 - api-key: STAGING_LABELBOX_API_KEY_3 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: "3.10" - api-key: STAGING_LABELBOX_API_KEY_4 - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.11 - api-key: STAGING_LABELBOX_API_KEY - da-test-key: DA_GCP_LABELBOX_API_KEY - - python-version: 3.12 - api-key: STAGING_LABELBOX_API_KEY_5 - da-test-key: DA_GCP_LABELBOX_API_KEY - uses: ./.github/workflows/python-package-shared.yml - with: - python-version: ${{ matrix.python-version }} - api-key: ${{ matrix.api-key }} - da-test-key: ${{ matrix.da-test-key }} - fixture-profile: true - test-env: 'staging' - secrets: inherit From 6ad2fb22b513407b4ba4a0967e072d4f6e0dad27 Mon Sep 17 00:00:00 2001 From: sfendell-labelbox <150080555+sfendell-labelbox@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:47:50 -0700 Subject: [PATCH 2/4] Update python-package-main.yml Newline. --- .github/workflows/python-package-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-main.yml b/.github/workflows/python-package-main.yml index cf9112172..b96c867bf 100644 --- a/.github/workflows/python-package-main.yml +++ b/.github/workflows/python-package-main.yml @@ -34,4 +34,4 @@ jobs: da-test-key: ${{ matrix.da-test-key }} fixture-profile: false test-env: 'prod' - secrets: inherit \ No newline at end of file + secrets: inherit From 641c82eb6586a302d2ee7d7d429c4bf3e33ecc85 Mon Sep 17 00:00:00 2001 From: sfendell-labelbox <150080555+sfendell-labelbox@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:47:50 -0700 Subject: [PATCH 3/4] Update python-package-develop.yaml Newline. --- .github/workflows/python-package-develop.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-develop.yaml b/.github/workflows/python-package-develop.yaml index 72154f656..63199127c 100644 --- a/.github/workflows/python-package-develop.yaml +++ b/.github/workflows/python-package-develop.yaml @@ -34,4 +34,4 @@ jobs: da-test-key: ${{ matrix.da-test-key }} fixture-profile: true test-env: 'staging' - secrets: inherit \ No newline at end of file + secrets: inherit From dbbc348b69ac989735131dec1e4f0e7b10c03e39 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Thu, 28 Mar 2024 17:10:01 -0700 Subject: [PATCH 4/4] remove print statements --- tests/conftest.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 442b13a5d..59833f682 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -122,9 +122,6 @@ def rest_url(environ: str) -> str: def testing_api_key(environ: str) -> str: - print('testing') - print(str) - print(os.environ) for var in [ "LABELBOX_TEST_API_KEY_PROD", "LABELBOX_TEST_API_KEY_STAGING", "LABELBOX_TEST_API_KEY_CUSTOM", "LABELBOX_TEST_API_KEY_LOCAL", @@ -132,7 +129,6 @@ def testing_api_key(environ: str) -> str: ]: value = os.environ.get(var) if value is not None: - print(value) return value raise Exception("Cannot find API to use for tests") @@ -315,8 +311,6 @@ def environ() -> Environ: Make sure to set LABELBOX_TEST_ENVIRON in .github/workflows/python-package.yaml """ try: - print('env') - print(os.environ['LABELBOX_TEST_ENVIRON']) return Environ(os.environ['LABELBOX_TEST_ENVIRON']) except KeyError: raise Exception(f'Missing LABELBOX_TEST_ENVIRON in: {os.environ}')