From 76b0aaa29f054e2b291d5e0e8884a2dc874efe84 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 11:37:01 -0700 Subject: [PATCH 01/12] add a line to the README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4dfc0e58..0d5a3d82 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ print(f"The answer is {image_query.result}") Your images are first analyzed by machine learning (ML) models which are automatically trained on your data. If those models have high enough confidence, that's your answer. But if the models are unsure, then the images are progressively escalated to more resource-intensive analysis methods up to real-time human review. So what you get is a computer vision system that starts working right away without even needing to first gather and label a dataset. At first it will operate with high latency, because people need to review the image queries. But over time, the ML systems will learn and improve so queries come back faster with higher confidence. +### Extra session + +Hello, please trigger a github action. + ## Learn more Some more resources you might like: From 65efa6a6260f6c53f26d8eb9e6f3e813e716b171 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 12:53:44 -0700 Subject: [PATCH 02/12] pin virtualenv in pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 56f944b5..3c7bb721 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ python-dateutil = "^2.9.0" requests = "^2.28.2" typer = "^0.12.3" urllib3 = "^1.26.9" +virtualenv = "^20.30.0" # TODO: unpin this later? [tool.poetry.group.dev.dependencies] datamodel-code-generator = "^0.22.1" From c17f6b9017dafc1aad39de50ba3a17016be75245 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:01:14 -0700 Subject: [PATCH 03/12] tighter virtualenv restrictions --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3c7bb721..76f548d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ python-dateutil = "^2.9.0" requests = "^2.28.2" typer = "^0.12.3" urllib3 = "^1.26.9" -virtualenv = "^20.30.0" # TODO: unpin this later? +virtualenv = ">=20.30,<20.31" # TODO: unpin when fixed? [tool.poetry.group.dev.dependencies] datamodel-code-generator = "^0.22.1" From cfcf4823b7d5055196375c5e187bfba896dbebb8 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:04:00 -0700 Subject: [PATCH 04/12] add 'poetry show virtualenv' to lint step --- .github/workflows/cicd.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index b97926d2..398d4c31 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -26,6 +26,9 @@ jobs: - name: show python version ${{ env.PYTHON_VERSION }} run: | poetry run python --version + - name: show virtualenv version + run: | + poetry show virtualenv - name: install linter dependencies run: | make install-lint From ca7f554d935ee3af9ee8f688899bcaf6e0a522f9 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:08:06 -0700 Subject: [PATCH 05/12] poetry lock first? --- .github/workflows/cicd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 398d4c31..363fc118 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -28,6 +28,7 @@ jobs: poetry run python --version - name: show virtualenv version run: | + poetry lock poetry show virtualenv - name: install linter dependencies run: | From 6a9c058f8134f5d441e6a7f043f38eebc3cd2b75 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:10:25 -0700 Subject: [PATCH 06/12] poetry self show --- .github/workflows/cicd.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 363fc118..a5948c08 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -28,8 +28,7 @@ jobs: poetry run python --version - name: show virtualenv version run: | - poetry lock - poetry show virtualenv + poetry self show virtualenv - name: install linter dependencies run: | make install-lint From 404b6560e7cf0e05b32692386479fb7faa1f9ad2 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:14:28 -0700 Subject: [PATCH 07/12] -vvv --- .github/workflows/cicd.yaml | 3 --- Makefile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index a5948c08..b97926d2 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -26,9 +26,6 @@ jobs: - name: show python version ${{ env.PYTHON_VERSION }} run: | poetry run python --version - - name: show virtualenv version - run: | - poetry self show virtualenv - name: install linter dependencies run: | make install-lint diff --git a/Makefile b/Makefile index 816bfcdc..244764bc 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ install-extras: install ## Install the package from source with extra dependenc poetry run pip install numpy framegrab[youtube] install-lint: ## Only install the linter dependencies - poetry install --only lint + poetry install -vvv --only lint install-dev: ## Only install the dev dependencies poetry install --only dev From ea652badf8fe2e499bd952e064a53a1788d8a63b Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:28:20 -0700 Subject: [PATCH 08/12] downgrade virtualenv using pip? --- .github/workflows/cicd.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index b97926d2..9d23c82f 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -26,6 +26,9 @@ jobs: - name: show python version ${{ env.PYTHON_VERSION }} run: | poetry run python --version + - name: Downgrade virtualenv + run: | + pip install virtualenv==20.30.0 - name: install linter dependencies run: | make install-lint From 9d054438baa585184ee54bdea7f2ac7fe78822ec Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:39:10 -0700 Subject: [PATCH 09/12] try deleting pypoetry cache?? --- .github/workflows/cicd.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 9d23c82f..54865695 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -19,6 +19,12 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.PYTHON_VERSION }} + - name: Downgrade virtualenv + run: | + pip install virtualenv==20.30.0 + - name: remove broken virtualenv wheel if cached + run: | + rm -rf ~/.cache/pypoetry - name: install poetry uses: snok/install-poetry@v1 with: @@ -26,9 +32,6 @@ jobs: - name: show python version ${{ env.PYTHON_VERSION }} run: | poetry run python --version - - name: Downgrade virtualenv - run: | - pip install virtualenv==20.30.0 - name: install linter dependencies run: | make install-lint From 049d29a61f66ee1fa42c3c871beda75fca1fa2df Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:44:36 -0700 Subject: [PATCH 10/12] try 'poetry config virtualenvs.create false'??? --- .github/workflows/cicd.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 54865695..5f987cff 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -19,16 +19,17 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ env.PYTHON_VERSION }} - - name: Downgrade virtualenv + - name: Install compatible virtualenv and pip run: | - pip install virtualenv==20.30.0 - - name: remove broken virtualenv wheel if cached - run: | - rm -rf ~/.cache/pypoetry + pip install --upgrade pip + pip install virtualenv==20.25.0 - name: install poetry uses: snok/install-poetry@v1 with: version: ${{ env.POETRY_VERSION }} + - name: Configure Poetry to disable virtualenv creation + run: | + poetry config virtualenvs.create false - name: show python version ${{ env.PYTHON_VERSION }} run: | poetry run python --version From 9b77de419c741131925ff545fad4c11ea5bf3a64 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:52:10 -0700 Subject: [PATCH 11/12] re-add cache-removal step???? --- .github/workflows/cicd.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 5f987cff..74bc995c 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -22,7 +22,10 @@ jobs: - name: Install compatible virtualenv and pip run: | pip install --upgrade pip - pip install virtualenv==20.25.0 + pip install virtualenv==20.30.0 + - name: Remove Poetry cache to avoid stale virtualenv + run: | + rm -rf ~/.cache/pypoetry - name: install poetry uses: snok/install-poetry@v1 with: From 6d1f92d02323dba7a56ea71d25073b7259c82679 Mon Sep 17 00:00:00 2001 From: Daryl Hansen Date: Mon, 5 May 2025 13:53:19 -0700 Subject: [PATCH 12/12] fix spacing issue --- .github/workflows/cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 74bc995c..67073f58 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -23,7 +23,7 @@ jobs: run: | pip install --upgrade pip pip install virtualenv==20.30.0 - - name: Remove Poetry cache to avoid stale virtualenv + - name: Remove Poetry cache to avoid stale virtualenv run: | rm -rf ~/.cache/pypoetry - name: install poetry