build: simplify requirements documents

UIUCLibrary · Nov 25, 2024 · 598b41f · 598b41f
1 parent afb8dae
commit 598b41f
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 311 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1176,7 +1176,7 @@ pipeline {
                                                         nsis: params.PACKAGE_WINDOWS_STANDALONE_NSIS,
                                                         zipFile: params.PACKAGE_WINDOWS_STANDALONE_ZIP,
                                                     ],
-                                                    vendoredPythonRequirementsFile: 'requirements-freeze.txt',
+                                                    vendoredPythonRequirementsFile: 'requirements-gui.txt',
                                                     buildDir: 'build\\cmake_build',
                                                     venvPath: "${WORKSPACE}\\build\\standalone_venv",
                                                     package: [

diff --git a/ci/docker/windows_standalone/Dockerfile b/ci/docker/windows_standalone/Dockerfile
@@ -110,14 +110,10 @@ RUN Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.208 -Force ;`
 ARG PIP_EXTRA_INDEX_URL
 ARG PIP_INDEX_URL
 ADD requirements.txt requirements-dev.txt c:\temp\
-RUN python -m pip install --upgrade pip ; `
-    pip install wheel ; `
-    pip install --upgrade setuptools ;`
-    python -m pip wheel -r c:\temp\requirements.txt -r c:\temp\requirements-dev.txt --wheel-dir c:\wheels
-
-RUN pip install --no-index --find-links=c:\wheels\ `
-        -r c:\temp\requirements.txt `
-        -r c:\temp\requirements-dev.txt
+RUN python -m pip install --no-cache-dir --upgrade pip ; `
+    pip install --no-cache-dir wheel ; `
+    pip install --no-cache-dir --upgrade setuptools ;`
+    pip install --no-cache-dir -r c:\temp\requirements-dev.txt
 
 ENV PIP_FIND_LINKS=c:\wheels\
 COPY ci/docker/windows_standalone/build_standalone.ps1 c:/scripts/build_standalone.ps1

diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,6 @@ requires-python = ">=3.9"
 license = { file="LICENSE"}
 dependencies =[
     "pyyaml",
-    'importlib_resources;python_version<"3.9"',
     'importlib-metadata;python_version<"3.10"',
     'typing-extensions;python_version<"3.11"',
     'lxml',