build: support uv.lock

Author: henryborchers

.github/workflows/wheels.yml

@@ -15,36 +15,23 @@ jobs:
       UV_EXTRA_INDEX_URL: ${{vars.PIP_EXTRA_INDEX_URL}}
     strategy:
       matrix:
-        os: [
-          ubuntu-20.04,
-          windows-2019, macos-13]
-        include:
-          - os: macos-13
-            compiler_version: 13
-          - os: ubuntu-20.04
-            compiler_version: 10.2
-          - os: windows-2019
-            compiler_version: 16
+        os: [ubuntu-latest, windows-latest, macos-13]
 
     steps:
       - uses: actions/checkout@v3
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v3
       - name: Install cibuildwheel
-        run: python -m pip install -r requirements/requirements-cibuildwheel.txt
+        run: python -m pip install uv
 
       - name: Build wheels
         if: contains(matrix.os, 'windows')
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          python -m cibuildwheel --output-dir wheelhouse
-        env:
-           CONAN_COMPILER_VERSION: ${{ matrix.compiler_version }}
+          uv run --only-group=cibuildwheel -m cibuildwheel --output-dir wheelhouse
       - name: Build wheels
         if: "!contains(matrix.os, 'windows')"
-        run: python -m cibuildwheel --output-dir wheelhouse
-        env:
-           CONAN_COMPILER_VERSION: ${{ matrix.compiler_version }}
+        run: uv run --only-group=cibuildwheel -m cibuildwheel --output-dir wheelhouse
         #   CIBW_SOME_OPTION: value

ci/docker/linux/jenkins/Dockerfile

@@ -12,6 +12,7 @@ ARG PIP_DOWNLOAD_CACHE=/.cache/pip
 ARG UV_CACHE_DIR=/.cache/uv
 # UV Cache directory. Change this only if you need to override the default location.
 
+FROM ghcr.io/astral-sh/uv:latest AS uv_builder
 
 FROM ubuntu:22.04 AS base_image
 RUN rm -f /etc/apt/apt.conf.d/docker-clean
@@ -37,7 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
      rm -rf /var/lib/apt/lists/*
 
 #==============================================================================
-FROM base_image AS DR_MEMORY_BUILDER
+FROM base_image AS dr_memory_builder
 RUN apt-get update &&  \
     apt-get install -y --no-install-recommends wget
 
@@ -48,7 +49,7 @@ RUN wget --no-verbose https://github.com/DynamoRIO/drmemory/releases/download/re
     drmemory -version
 
 
-FROM base_image AS SONAR_BUILDER
+FROM base_image AS sonar_builder
 
 RUN case $(uname -m) in \
     x86_64) URL=https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip ;; \
@@ -70,30 +71,30 @@ ARG PIP_INDEX_URL
 ARG UV_EXTRA_INDEX_URL
 ARG UV_INDEX_URL
 
-COPY conanfile.py /tmp/conanfile.py
+COPY --from=uv_builder /uv /uvx /bin/
 COPY ci/docker/linux/shared/ensure_compiler_support_by_conan.py /tmp/ensure_compiler_support_by_conan.py
-COPY requirements-dev.txt /tmp/requirements-dev.txt
 ARG UV_CACHE_DIR
 ARG PIP_DOWNLOAD_CACHE
 ARG CONAN_CENTER_PROXY_V2_URL
 ARG CONAN_HOME
-ENV UV_CONSTRAINT=/tmp/requirements-dev.txt
-
+ENV UV_PROJECT=/tmp/uv
+ENV UV_FROZEN=1
 COPY ci/docker/linux/jenkins/conan/profile.ini  ${CONAN_HOME}/profiles/default
 COPY ci/docker/shared/conan/remotes.json ${CONAN_HOME}/remotes.json
 RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
     --mount=type=cache,target=${UV_CACHE_DIR} \
-    python3 -m venv venv && \
-    venv/bin/pip install --no-cache --disable-pip-version-check uv && \
-    venv/bin/uvx --with cmake conan profile detect --exist-ok &&  \
-    python3 /tmp/ensure_compiler_support_by_conan.py $(venv/bin/uvx --with cmake conan config home)/settings.yml  11.4 && \
+    --mount=type=bind,source=pyproject.toml,target=${UV_PROJECT}/pyproject.toml \
+    --mount=type=bind,source=uv.lock,target=${UV_PROJECT}/uv.lock \
+    --mount=type=bind,source=conanfile.py,target=/tmp/conanfile.py \
+    uv run --only-group=conan conan profile detect --exist-ok &&  \
+    python3 /tmp/ensure_compiler_support_by_conan.py $(uv run --only-group=conan conan config home)/settings.yml  11.4 && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
         echo "Setting the conan center url for building cache: ${CONAN_CENTER_PROXY_V2_URL}" && \
         cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
-        ./venv/bin/uvx --with cmake conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
+        uv run --only-group=conan conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
     fi && \
-    venv/bin/uvx --with cmake conan install /tmp --build missing -pr:b=default && \
-    venv/bin/uvx --with cmake conan cache clean "*" -b --source --build --temp && \
+    uv run --only-group=conan conan install /tmp --build missing -pr:b=default && \
+    uv run --only-group=conan conan cache clean "*" -b --source --build --temp && \
     rm -rf venv && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
         mv -f /tmp/remotes.json ${CONAN_HOME}/remotes.json; \
@@ -108,7 +109,7 @@ FROM base_image
 # Install sonar build-wrapper
 # -----------------------------------------------------------------------------
 
-COPY --from=SONAR_BUILDER /opt/build-wrapper-linux /opt/build-wrapper-linux/
+COPY --from=sonar_builder /opt/build-wrapper-linux /opt/build-wrapper-linux/
 
 RUN case $(uname -m) in \
         x86_64) ln -s /opt/build-wrapper-linux/build-wrapper-linux-x86/build-wrapper-linux-x86-64 /usr/local/bin/build-wrapper-linux  ;; \
@@ -120,7 +121,7 @@ ENV SONAR_SCANNER_OPTS="-server"
 # -----------------------------------------------------------------------------
 # Install Doctor memory
 # -----------------------------------------------------------------------------
-COPY --from=DR_MEMORY_BUILDER /opt/drmemory /opt/drmemory/
+COPY --from=dr_memory_builder /opt/drmemory /opt/drmemory/
 RUN ln -s /opt/drmemory/bin64/drmemory /usr/local/bin/drmemory && \
     drmemory -version
 
@@ -132,6 +133,5 @@ ARG CONAN_USER_HOME
 ENV CONAN_USER_HOME=${CONAN_USER_HOME}
 ARG CONAN_HOME
 ENV CONAN_HOME=${CONAN_HOME}
-COPY --from=conan_builder ${CONAN_HOME} ${CONAN_HOME}
-RUN chmod -R 777 ${CONAN_HOME}
+COPY --from=conan_builder --chmod=777 ${CONAN_HOME} ${CONAN_HOME}
 ENV TZ=UTC

ci/docker/linux/tox/Dockerfile

@@ -10,6 +10,9 @@ ARG CONAN_CENTER_PROXY_V2_URL=https://center2.conan.io
 ARG PIP_DOWNLOAD_CACHE=/.cache/pip
 ARG UV_CACHE_DIR=/.cache/uv
 ARG UV_EXTRA_INDEX_URL
+
+FROM ghcr.io/astral-sh/uv:latest AS uv_builder
+
 FROM ubuntu:22.04 AS wheel_builder_base
 COPY ci/docker/linux/tox/apt-packages.txt /tmp/apt-packages.txt
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -27,36 +30,36 @@ ARG CONAN_USER_HOME
 RUN mkdir -p ${CONAN_USER_HOME}
 
 FROM wheel_builder_base AS conan_builder
-COPY requirements-dev.txt /tmp/requirements-dev.txt
+COPY --from=uv_builder /uv /uvx /bin/
 ARG CONAN_USER_HOME
 ARG CONAN_HOME
 COPY ci/docker/linux/shared/ensure_compiler_support_by_conan.py /tmp/ensure_compiler_support_by_conan.py
 COPY ci/docker/shared/conan/remotes.json ${CONAN_HOME}/remotes.json
-
 COPY conanfile.py /tmp/conanfile.py
 ARG CONAN_CENTER_PROXY_V2_URL
 ARG PIP_EXTRA_INDEX_URL
 ARG PIP_INDEX_URL
 ARG UV_EXTRA_INDEX_URL
 ARG UV_INDEX_URL
-ENV UV_CONSTRAINT=/tmp/requirements-dev.txt
 ARG PIP_DOWNLOAD_CACHE
 ARG UV_CACHE_DIR
+ENV UV_PROJECT=/tmp/uv
+ENV UV_FROZEN=1
 RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
     --mount=type=cache,target=${UV_CACHE_DIR} \
-    python3 -m venv venv && \
-    ./venv/bin/pip install --no-cache --disable-pip-version-check uv && \
-    ./venv/bin/uvx --with cmake conan profile detect --exist-ok &&  \
-    ./venv/bin/uv run /tmp/ensure_compiler_support_by_conan.py ${CONAN_HOME}/settings.yml  11.4 && \
-    cat $(./venv/bin/uvx --with cmake conan config home)/settings.yml && \
-    ./venv/bin/uvx --with cmake conan config home && \
+    --mount=type=bind,source=pyproject.toml,target=${UV_PROJECT}/pyproject.toml \
+    --mount=type=bind,source=uv.lock,target=${UV_PROJECT}/uv.lock \
+    --mount=type=bind,source=conanfile.py,target=/tmp/conanfile.py \
+    uv run --only-group=conan conan profile detect --exist-ok &&  \
+    cat $(uv run --only-group=conan conan config home)/settings.yml && \
+    uv run --only-group=conan conan config home && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
         echo "Setting the conan center url for building cache: ${CONAN_CENTER_PROXY_V2_URL}" && \
         cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
-        ./venv/bin/uvx --with cmake conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
+        uv run --only-group=conan conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
     fi && \
-    ./venv/bin/uvx --with cmake conan install /tmp --build missing --build=openjpeg && \
-    ./venv/bin/uvx --with cmake conan cache clean "*" -b --source --build --temp && \
+    uv run --only-group=conan conan install /tmp --build missing --build=openjpeg && \
+    uv run --only-group=conan conan cache clean "*" -b --source --build --temp && \
     rm -rf venv && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
         mv -f /tmp/remotes.json ${CONAN_HOME}/remotes.json; \
@@ -68,14 +71,13 @@ FROM wheel_builder_base
 
 ARG CONAN_USER_HOME
 ARG CONAN_HOME
-COPY --from=conan_builder ${CONAN_HOME} ${CONAN_HOME}
+COPY --from=conan_builder --chmod=777 ${CONAN_HOME} ${CONAN_HOME}
 ENV CONAN_HOME=${CONAN_HOME}
 ENV CONAN_USER_HOME=${CONAN_USER_HOME}
 
 ARG UV_CACHE_DIR
 ARG PIP_DOWNLOAD_CACHE
-RUN chmod -R 777 ${CONAN_HOME} && \
-    mkdir -p ${PIP_DOWNLOAD_CACHE} && \
+RUN mkdir -p ${PIP_DOWNLOAD_CACHE} && \
     chmod -R 777 ${PIP_DOWNLOAD_CACHE} && \
     mkdir -p ${UV_CACHE_DIR} && \
     chmod -R 777 ${UV_CACHE_DIR}

pyproject.toml

@@ -65,6 +65,8 @@ ci = [
     "pysonar",
 ]
 package = ["delocate ; sys_platform == 'darwin'"]
+cibuildwheel = ['cibuildwheel']
+
 [tool.setuptools]
 packages = [
     "uiucprescon.imagevalidate",
@@ -110,21 +112,21 @@ environment-pass = ["CONAN_COMPILER_LIBCXX", "CONAN_COMPILER_VERSION", "CONAN_US
 
 [tool.cibuildwheel.windows]
 before-all = [
-    "pip install wheel",
-    "pip install -r requirements-dev.txt uv",
-    "conan profile new default --detect --force",
-    "conan profile update settings.compiler.version=%CONAN_COMPILER_VERSION% default",
-    "conan install ./ --build missing",
+    'echo Conan user home: %CONAN_USER_HOME%',
+    'echo Conan home: %CONAN_HOME%',
+    'uv run --only-group=conan --isolated conan profile detect --exist-ok',
+    'uv run --only-group=conan --isolated conan profile new default --detect --force',
+    'uv run --only-group=conan --isolated conan install ./ --build missing',
 ]
 [tool.cibuildwheel.windows.environment]
 CONAN_USER_HOME="$TEMP/conan"
 
 [tool.cibuildwheel.macos]
 before-all = [
-    "pip3 install -r requirements-dev.txt uv",
-    "conan profile new $ENVTMPDIR/.conan/profiles/default --detect --force",
-    "if [ -z \"$CONAN_COMPILER_VERSION\" ]; then : ; else conan profile update settings.compiler.version=$CONAN_COMPILER_VERSION default; fi",
-    "conan install ./ --build missing --install-folder=$CONAN_BUILD_INFO_DIR"
+    'echo "Conan user home: $CONAN_USER_HOME"',
+    'echo "Conan home: $CONAN_HOME"',
+    'uv run --only-group=conan --isolated conan profile detect --exist-ok',
+    "uv run --only-group=conan --isolated conan install ./ --build missing --install-folder=$CONAN_BUILD_INFO_DIR"
 ]
 environment-pass = ["CONAN_COMPILER_VERSION", "CONAN_USER_HOME"]
 repair-wheel-command = [
@@ -143,11 +145,11 @@ CONAN_BUILD_INFO_DIR="/tmp/conan/build/"
 repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
 before-all = [
     "cc --version", "cc -dumpfullversion -dumpversion",
-    "uvx --index-strategy=unsafe-first-match --with $(grep ^conan requirements-dev.txt)  conan profile new /tmp/conan/.conan/profiles/default --detect",
-    "if [ -z \"$CONAN_COMPILER_LIBCXX\" ];  then : ; else uvx --index-strategy=unsafe-first-match --with $(grep ^conan requirements-dev.txt) conan profile update settings.compiler.libcxx=$CONAN_COMPILER_LIBCXX   default; fi",
-    "if [ -z \"$CONAN_COMPILER_VERSION\" ]; then : ; else uvx --index-strategy=unsafe-first-match --with $(grep ^conan requirements-dev.txt) conan profile update settings.compiler.version=$CONAN_COMPILER_VERSION default; fi",
-    "uvx --index-strategy=unsafe-first-match --with $(grep ^conan requirements-dev.txt) conan profile show default",
-    "uvx --index-strategy=unsafe-first-match --with $(grep ^conan requirements-dev.txt) conan install ./ --build missing -pr:b=default",
+    'echo "Conan user home: $CONAN_USER_HOME"',
+    'echo "Conan home: $CONAN_HOME"',
+    'uv run --only-group=conan --isolated conan profile detect --exist-ok',
+    'uv run --only-group=conan conan profile show default',
+    'uv run --only-group=conan conan install ./ --build missing -pr:b=default',
 
 ]
 [tool.cibuildwheel.linux.environment]
@@ -157,7 +159,7 @@ CONAN_BUILD_INFO_DIR="/tmp/conan/build/"
 PYTHONFAULTHANDLER="True"
 
 [tool.uv]
-cache-keys = [{ file = "pyproject.toml" }, { file = "requirements-dev.txt" }, { file = "setup.py" }, { dir = "/Users/hborcher/CLionProjects/henryborchers/uiucprescon_build" }]
+cache-keys = [{ file = "pyproject.toml" }, { file = "conanfile.py" }, { file = "setup.py" }]
 
 [tool.uv.sources]
 py3exiv2bind = {index = "uiuc_prescon_python"}