From e6962a2a8f30efdab1c67222d20660ee10a26ff5 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Thu, 12 Sep 2024 11:46:24 -0400 Subject: [PATCH 1/3] Pin conda-lock dependency to fix current build. --- environment.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/environment.yaml b/environment.yaml index 06e49a6..2f65b6b 100644 --- a/environment.yaml +++ b/environment.yaml @@ -4,8 +4,8 @@ channels: dependencies: - python - click - - conda-lock=1.* - - conda-build + - conda-lock=1.1.2 + - conda-build - pip # solvers - conda=4.12.0 @@ -16,10 +16,3 @@ dependencies: - pytest-mock - setuptools - wheel - - - - - - - From 85163ab118bb9caeb75225caab2228f37c02a2aa Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Thu, 12 Sep 2024 16:26:02 -0400 Subject: [PATCH 2/3] Pin pydantic to resolve validation errors. --- environment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yaml b/environment.yaml index 2f65b6b..b2888b8 100644 --- a/environment.yaml +++ b/environment.yaml @@ -7,6 +7,7 @@ dependencies: - conda-lock=1.1.2 - conda-build - pip + - pydantic=1.8.1 # solvers - conda=4.12.0 - mamba From 261740f7587bbc31fc73828909a0d7d638c5a2f3 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Thu, 12 Sep 2024 16:38:19 -0400 Subject: [PATCH 3/3] Remove python 3.7 version from test. --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 771eb64..24a6e63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,16 +5,16 @@ on: jobs: test-general: - name: 'conda-vendor tests' + name: "conda-vendor tests" runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9] steps: - - name: 'Checkout condan-vendor' + - name: "Checkout condan-vendor" uses: actions/checkout@main - - name: 'Install conda dependencies' + - name: "Install conda dependencies" uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.python-version }}