From aa2758b96ed9b402d06fdc21efbdf600c607526d Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 15:28:09 -0700 Subject: [PATCH 1/7] fix windows runs --- .github/workflows/public-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 60753305..0f381433 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -16,7 +16,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install CI deps run: | - pip install --upgrade pip setuptools wheel + pip install --upgrade pip setuptools wheel pytest pip install shapely -f ${{ secrets.CI_PIP_INDEX_URL }}/simple/shapely/index.html - name: Build wheel run: | From ecd3580cc333682dc75f0cb34df7c615df905de8 Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 15:44:20 -0700 Subject: [PATCH 2/7] update setup-python --- .github/workflows/public-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 0f381433..82c081a6 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -10,13 +10,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install CI deps run: | - pip install --upgrade pip setuptools wheel pytest + pip install --upgrade pip setuptools wheel pytest==6.0.0 pip install shapely -f ${{ secrets.CI_PIP_INDEX_URL }}/simple/shapely/index.html - name: Build wheel run: | From 4931afb029fd1aacee499da3a89c2ca9fc0c49fc Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 15:50:32 -0700 Subject: [PATCH 3/7] invoke another way --- .github/workflows/public-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 82c081a6..254a28d7 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -28,7 +28,7 @@ jobs: DESCARTESLABS_ENV: testing run: | mkdir tempdir - pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs + python -m pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs rm -r tempdir - name: Test CLI env: From 11019568397480c07b83c5429f621fcdf8a6d44f Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 15:59:26 -0700 Subject: [PATCH 4/7] testing --- .github/workflows/public-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 254a28d7..7af098c6 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-2022, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 @@ -28,6 +28,7 @@ jobs: DESCARTESLABS_ENV: testing run: | mkdir tempdir + python -c "import sys; print(sys.path)" python -m pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs rm -r tempdir - name: Test CLI From bfb94afe3b2e441e00fd654d623c28d055959497 Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 16:10:00 -0700 Subject: [PATCH 5/7] more debug --- .github/workflows/public-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 7af098c6..0eebaced 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -28,7 +28,8 @@ jobs: DESCARTESLABS_ENV: testing run: | mkdir tempdir - python -c "import sys; print(sys.path)" + python -m pip freeze + ls C:\\hostedtoolcache\\windows\\Python\3.11.9\x64\Lib\site-packages python -m pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs rm -r tempdir - name: Test CLI From ad798f6ee4a15030a4ebc1c55bb179b3210e739c Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 16:17:03 -0700 Subject: [PATCH 6/7] debugggggg --- .github/workflows/public-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 0eebaced..30f878cb 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-2022, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 @@ -16,12 +16,14 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install CI deps run: | - pip install --upgrade pip setuptools wheel pytest==6.0.0 - pip install shapely -f ${{ secrets.CI_PIP_INDEX_URL }}/simple/shapely/index.html + python -m pip install --upgrade pip setuptools wheel pytest==6.0.0 + python -m pip install shapely -f ${{ secrets.CI_PIP_INDEX_URL }}/simple/shapely/index.html + python -m pip freeze - name: Build wheel run: | - pip wheel --no-deps --wheel-dir wheels -e . - pip install -e .[complete,tests] + python -m pip wheel --no-deps --wheel-dir wheels -e . + python -m pip install -e .[complete,tests] + python -m pip freeze - name: Test Client env: TMPDIR: tempdir @@ -29,7 +31,6 @@ jobs: run: | mkdir tempdir python -m pip freeze - ls C:\\hostedtoolcache\\windows\\Python\3.11.9\x64\Lib\site-packages python -m pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs rm -r tempdir - name: Test CLI From 754c6285fcc8b0d01c3748bc1bfad811b8bdd101 Mon Sep 17 00:00:00 2001 From: "Stephen C. Pope" Date: Tue, 28 Jan 2025 16:23:56 -0700 Subject: [PATCH 7/7] verify version --- .github/workflows/public-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/public-ci.yml b/.github/workflows/public-ci.yml index 30f878cb..ce47722a 100644 --- a/.github/workflows/public-ci.yml +++ b/.github/workflows/public-ci.yml @@ -16,21 +16,19 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install CI deps run: | - python -m pip install --upgrade pip setuptools wheel pytest==6.0.0 + python -m pip install --upgrade pip setuptools wheel python -m pip install shapely -f ${{ secrets.CI_PIP_INDEX_URL }}/simple/shapely/index.html - python -m pip freeze - name: Build wheel run: | python -m pip wheel --no-deps --wheel-dir wheels -e . python -m pip install -e .[complete,tests] - python -m pip freeze - name: Test Client env: TMPDIR: tempdir DESCARTESLABS_ENV: testing run: | mkdir tempdir - python -m pip freeze + python --version python -m pytest -rfExXP --assert=plain --ignore-glob="*/smoke_tests" --ignore-glob="*/e2e" --ignore="descarteslabs/core/third_party" descarteslabs rm -r tempdir - name: Test CLI