Merge branch 'main' into CIF-197-CORE-Resolution-option-for-layer-dow…

…nloads
wri · Sep 4, 2024 · e4ced61 · e4ced61
2 parents 409e706 + d37b79c
commit e4ced61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
+exactextract==0.2.0.dev252
diff --git 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

diff --git 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
@@ -28,7 +28,7 @@
         "s3fs",
         "dask>=2023.11.0",
         "boto3",
-        "exactextract",
+        "exactextract<=0.2.0.dev252",
         "overturemaps",
         "scikit-learn>=1.5.0",
     ],