From 8ef3191a2c6a5a2a9c59ea9731d770d6451c53a2 Mon Sep 17 00:00:00 2001
From: kim <ktfairbanks@alaska.edu>
Date: Wed, 24 Apr 2024 10:47:03 -0800
Subject: [PATCH] removes deprecated sklearn dependency, upgrades
 pytest-automation, wktutils

---
 .../reusable-DeployStack-SearchAPI.yml        |  1 -
 Dockerfile                                    |  1 -
 requirements.txt                              | 19 +++++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/reusable-DeployStack-SearchAPI.yml b/.github/workflows/reusable-DeployStack-SearchAPI.yml
index b98ad650..9f2bd9a8 100644
--- a/.github/workflows/reusable-DeployStack-SearchAPI.yml
+++ b/.github/workflows/reusable-DeployStack-SearchAPI.yml
@@ -101,7 +101,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install libgdal-dev
-          export SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True
           python3 -m pip install --no-cache-dir --upgrade pip
           python3 -m pip install --no-cache-dir wheel Cython
           python3 -m pip install -r requirements.txt --use-deprecated=legacy-resolver
diff --git a/Dockerfile b/Dockerfile
index f822390d..9b6f5d86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,6 @@ WORKDIR "${LAMBDA_TASK_ROOT}/Discovery-SearchAPI"
 COPY requirements.txt .
 RUN mkdir "${LAMBDA_TASK_ROOT}/python-packages"
 ENV PYTHONPATH "${PYTHONPATH}:${LAMBDA_TASK_ROOT}/python-packages"
-ENV SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True
 RUN python3 -m pip install --no-cache-dir -r requirements.txt --target "${LAMBDA_TASK_ROOT}/python-packages"
 
 ## Copy required files (Already inside Discovery-SearchAPI dir):
diff --git a/requirements.txt b/requirements.txt
index 132f3d07..cf59ca60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,7 +43,7 @@ hjson==3.0.2
 hypothesis==6.37.0
 idna==3.3
 importlib-metadata==4.8.1
-iniconfig==1.1.1
+# iniconfig==1.2.1
 itsdangerous==2.2.0
 Jinja2==3.1.3
 jmespath==0.10.0
@@ -57,26 +57,25 @@ MarkupSafe==2.1.5
 more-itertools==8.10.0
 munch==2.5.0
 numpy==1.22.4
-packaging==21.0
+packaging==24.0
 pandas==1.3.4
 pathlib2==2.3.6
 pep517==0.12.0
 pexpect==4.8.0
 pip-tools==6.4.0
 placebo==0.10.0
-pluggy==1.0.0
+pluggy==1.5.0
 ptyprocess==0.7.0
-py==1.10.0
 pycparser==2.20
 PyGithub==1.55
-PyJWT==2.3.0
+PyJWT==2.4.0
 pykml==0.2.0
 # PyNaCl==1.5.0
 pyparsing==2.4.7
 pyproj==3.6.0
 pyshp==2.1.3
-pytest==6.2.5
-pytest-automation==1.1.2
+pytest==8.1.1
+pytest-automation==3.0.0
 pytest-cov==3.0.0
 pytest-forked==1.3.0
 pytest-xdist==2.4.0
@@ -85,7 +84,7 @@ python-gitlab==2.10.1
 python-slugify==5.0.2
 pytz==2021.3
 pytz-deprecation-shim==0.1.0.post0
-PyYAML==6.0
+PyYAML==6.0.1
 regex==2021.10.8
 requests==2.26.0
 requests-toolbelt==0.9.1
@@ -103,13 +102,13 @@ sortedcontainers==2.4.0
 text-unidecode==1.3
 threadpoolctl==3.4.0
 toml==0.10.2
-tomli==1.2.1
+tomli==2.0.1
 typing-extensions==3.10.0.2
 tzdata==2021.4
 tzlocal==2.0.0
 urllib3==1.26.7
 Werkzeug==2.3.3
-WKTUtils==1.1.6
+WKTUtils==2.0.0
 wrapt==1.16.0
 zipp==3.6.0
 zope.interface==4.7.2