From bbace376c2c669dfad27c44800a4b34db1f1c540 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 10 Jan 2024 16:37:32 -0600 Subject: [PATCH] requirements-ci.txt is replaced by requirements-dev.txt --- ci/docker/linux/jenkins/Dockerfile | 6 +++--- ci/docker/linux/tox/Dockerfile | 8 ++++---- ci/docker/windows/tox/Dockerfile | 4 ++-- ci/docker/windows/tox_no_vs/Dockerfile | 4 ++-- requirements-ci.txt | 5 ----- requirements-dev.txt | 4 +++- requirements/requirements-ci.txt | 1 - ...irements-ci-freeze.txt => requirements-dev-freeze.txt} | 0 requirements/requirements-dev.txt | 3 ++- 9 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 requirements-ci.txt delete mode 100644 requirements/requirements-ci.txt rename requirements/{requirements-ci-freeze.txt => requirements-dev-freeze.txt} (100%) diff --git a/ci/docker/linux/jenkins/Dockerfile b/ci/docker/linux/jenkins/Dockerfile index dd1cfb30..1d2b5a2c 100644 --- a/ci/docker/linux/jenkins/Dockerfile +++ b/ci/docker/linux/jenkins/Dockerfile @@ -23,12 +23,12 @@ RUN python -m pip --no-cache-dir install --upgrade pip && \ FROM base_python AS wheel_builder ARG PIP_EXTRA_INDEX_URL ARG PIP_INDEX_URL -COPY requirements-ci.txt /requirements/ +COPY requirements-dev.txt /requirements/ COPY requirements/ /requirements/requirements/ ARG PIP_FIND_LINKS RUN mkdir -p ${PIP_FIND_LINKS} && \ - pip wheel --wheel-dir=${PIP_FIND_LINKS} --no-cache-dir -r /requirements/requirements-ci.txt + pip wheel --wheel-dir=${PIP_FIND_LINKS} --no-cache-dir -r /requirements/requirements-dev.txt FROM base_python AS conan_builder ARG CONAN_USER_HOME @@ -107,7 +107,7 @@ ARG PIP_TRUSTED_HOST COPY --from=wheel_builder ${PIP_FIND_LINKS}/* ${PIP_FIND_LINKS}/ COPY --from=wheel_builder requirements/ /requirements RUN pip install --no-index --no-cache-dir --find-links=${PIP_FIND_LINKS} \ - -r /requirements/requirements-ci.txt + -r /requirements/requirements-dev.txt ARG CONAN_USER_HOME COPY --from=conan_builder ${CONAN_USER_HOME}/.conan/ ${CONAN_USER_HOME}/.conan/ diff --git a/ci/docker/linux/tox/Dockerfile b/ci/docker/linux/tox/Dockerfile index 21926085..c0ceed3d 100644 --- a/ci/docker/linux/tox/Dockerfile +++ b/ci/docker/linux/tox/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /.cache/pip && \ FROM wheel_builder_base AS conan_builder ARG CONAN_USER_HOME -COPY requirements/requirements-ci-freeze.txt /tmp/requirements-ci-freeze.txt -RUN python3 -m pip install pip --upgrade && pip3 install --no-cache-dir -r /tmp/requirements-ci-freeze.txt +COPY requirements/requirements-dev-freeze.txt /tmp/requirements-dev-freeze.txt +RUN python3 -m pip install pip --upgrade && pip3 install --no-cache-dir -r /tmp/requirements-dev-freeze.txt COPY ci/docker/shared/conan/remotes.json ${CONAN_USER_HOME}/.conan/remotes.json COPY conanfile.py /tmp/conanfile.py COPY ci/docker/linux/tox/update_conan_compiler.py /tmp/update_conan_compiler.py @@ -41,8 +41,8 @@ ARG PIP_EXTRA_INDEX_URL ARG PIP_INDEX_URL COPY requirements/ /tmp/requirements/requirements/ -COPY requirements-ci.txt /tmp/requirements/requirements-ci.txt -RUN python3 -m pip install pip --upgrade && pip3 install --no-cache-dir -r /tmp/requirements/requirements-ci.txt +COPY requirements-dev.txt /tmp/requirements/requirements-dev.txt +RUN python3 -m pip install pip --upgrade && pip3 install --no-cache-dir -r /tmp/requirements/requirements-dev.txt COPY --from=conan_builder ${CONAN_USER_HOME}/.conan/ ${CONAN_USER_HOME}/.conan/ diff --git a/ci/docker/windows/tox/Dockerfile b/ci/docker/windows/tox/Dockerfile index 890da62d..d6c6627c 100644 --- a/ci/docker/windows/tox/Dockerfile +++ b/ci/docker/windows/tox/Dockerfile @@ -145,14 +145,14 @@ RUN certutil -addstore -f root roots.sst ; ` ARG PIP_EXTRA_INDEX_URL ARG PIP_INDEX_URL -COPY requirements-ci.txt c:/python_requirments/ +COPY requirements-dev.txt c:/python_requirments/ COPY requirements/ c:/python_requirments/requirements RUN py -3.8 -m pip install --upgrade pip ; ` py -3.9 -m pip install --upgrade pip ; ` py -3.10 -m pip install --upgrade pip ; ` py -3.11 -m pip install --upgrade pip ; ` py -3.12 -m pip install --upgrade pip ; ` - python -m pip install pip --upgrade ; pip install --no-cache-dir -r c:/python_requirments/requirements-ci.txt + python -m pip install pip --upgrade ; pip install --no-cache-dir -r c:/python_requirments/requirements-dev.txt ARG CONAN_USER_HOME COPY --from=CONAN_BUILDER ${CONAN_USER_HOME}/.conan/ ${CONAN_USER_HOME}/.conan/ diff --git a/ci/docker/windows/tox_no_vs/Dockerfile b/ci/docker/windows/tox_no_vs/Dockerfile index 87e0fe83..eed078eb 100644 --- a/ci/docker/windows/tox_no_vs/Dockerfile +++ b/ci/docker/windows/tox_no_vs/Dockerfile @@ -55,9 +55,9 @@ RUN certutil -addstore -f root roots.sst ; ` ARG PIP_EXTRA_INDEX_URL ARG PIP_INDEX_URL -COPY requirements-ci.txt c:/python_requirments/ +COPY requirements-dev.txt c:/python_requirments/ COPY requirements/ c:/python_requirments/requirements -RUN python -m pip install pip --upgrade ; pip install --no-cache-dir -r c:/python_requirments/requirements-ci.txt +RUN python -m pip install pip --upgrade ; pip install --no-cache-dir -r c:/python_requirments/requirements-dev.txt ARG PIP_DOWNLOAD_CACHE RUN New-Item -type directory -path ${Env:PIP_DOWNLOAD_CACHE} -Force diff --git a/requirements-ci.txt b/requirements-ci.txt deleted file mode 100644 index f134d03e..00000000 --- a/requirements-ci.txt +++ /dev/null @@ -1,5 +0,0 @@ --r requirements/requirements-ci-freeze.txt --r requirements/requirements-tox.txt --r requirements/requirements-dev.txt --r requirements/requirements-ci.txt --r requirements/requirements-extras.txt diff --git a/requirements-dev.txt b/requirements-dev.txt index 66e3287d..3012f4e9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,2 +1,4 @@ --r requirements/requirements-tox.txt -r requirements/requirements-dev.txt +-r requirements/requirements-dev-freeze.txt +-r requirements/requirements-tox.txt +-r requirements/requirements-extras.txt diff --git a/requirements/requirements-ci.txt b/requirements/requirements-ci.txt deleted file mode 100644 index af996cf7..00000000 --- a/requirements/requirements-ci.txt +++ /dev/null @@ -1 +0,0 @@ -twine diff --git a/requirements/requirements-ci-freeze.txt b/requirements/requirements-dev-freeze.txt similarity index 100% rename from requirements/requirements-ci-freeze.txt rename to requirements/requirements-dev-freeze.txt diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 8d2912e3..ed1cda44 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -10,4 +10,5 @@ pytest pytest-bdd<4.0 sphinx toml -uiucprescon.build @ git+https://github.com/UIUCLibrary/uiucprescon_build.git@v0.1.0 \ No newline at end of file +uiucprescon.build @ git+https://github.com/UIUCLibrary/uiucprescon_build.git@v0.1.0 +twine