From de895686591863ebc5840284b4401bdd39d1c581 Mon Sep 17 00:00:00 2001 From: Chris Rowe Date: Fri, 30 Aug 2024 14:56:44 -0400 Subject: [PATCH 1/3] set exactextract version --- .github/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/requirements.txt b/.github/requirements.txt index 9928a46..6b06f18 100644 --- a/.github/requirements.txt +++ b/.github/requirements.txt @@ -17,4 +17,4 @@ pip==23.3.1 boto3==1.34.124 scikit-learn==1.5.0 overturemaps==0.6.0 -git+https://github.com/isciences/exactextract \ No newline at end of file +exactextract==0.2.0.dev252 From e74db45137f62cf4814608b89d1f789eda3a77a7 Mon Sep 17 00:00:00 2001 From: Chris Rowe Date: Fri, 30 Aug 2024 15:09:50 -0400 Subject: [PATCH 2/3] Use exactextract for conda and and package install --- environment.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 24ec040..0459608 100644 --- a/environment.yml +++ b/environment.yml @@ -22,6 +22,6 @@ dependencies: - pip=23.3.1 - boto3=1.34.124 - scikit-learn=1.5.0 + - exactextract=0.2.0.dev252 - pip: - - git+https://github.com/isciences/exactextract - overturemaps==0.6.0 diff --git a/setup.py b/setup.py index 3124621..179b595 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ "s3fs", "dask>=2023.11.0", "boto3", - "exactextract", + "exactextract<=0.2.0.dev252", "overturemaps", "scikit-learn>=1.5.0", ], From f073a6fc3ea08476ae210ed36b7ec3c87319c7dc Mon Sep 17 00:00:00 2001 From: Chris Rowe Date: Tue, 3 Sep 2024 15:58:42 -0400 Subject: [PATCH 3/3] Update dev_ci_cd.yml --- .github/workflows/dev_ci_cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_ci_cd.yml b/.github/workflows/dev_ci_cd.yml index 6d55444..c57fd39 100644 --- a/.github/workflows/dev_ci_cd.yml +++ b/.github/workflows/dev_ci_cd.yml @@ -14,9 +14,9 @@ jobs: python-version: ["3.10"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install Linux dependencies