From d986d1c567aba1f4b9882b2b2d65e38b3127b232 Mon Sep 17 00:00:00 2001 From: Kori Kuzma Date: Wed, 18 Feb 2026 08:30:53 -0500 Subject: [PATCH] fix: pin version in pyproject.toml (removes setuptools_scm) close #91 * Also removes `ANYVLM_VERSION` argument for Docker --- .github/workflows/release.yaml | 3 --- Dockerfile | 6 +----- Makefile | 2 -- compose.dev.yaml | 3 --- docs/source/configuration/docker_compose.rst | 4 ---- docs/source/getting_started/docker_compose.rst | 2 +- pyproject.toml | 10 ++-------- 7 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d336fd4..265b8b9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,6 @@ jobs: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} - ANYVLM_VERSION: ${{ github.event.release.tag_name }} steps: - name: Checkout repository @@ -48,8 +47,6 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: | - ANYVLM_VERSION=${{ env.ANYVLM_VERSION }} - name: Generate artifact attestation uses: actions/attest-build-provenance@v3 diff --git a/Dockerfile b/Dockerfile index 2e82aec..fdc5675 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,6 @@ LABEL org.opencontainers.image.source=https://github.com/genomicmedlab/anyvlm LABEL org.opencontainers.image.description="AnyVLM container image" LABEL org.opencontainers.image.licenses=Apache-2.0 -ARG ANYVLM_VERSION -RUN echo "Building AnyVLM version: ${ANYVLM_VERSION}" -ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_ANYVLM=${ANYVLM_VERSION} - RUN apt-get update && \ apt-get install -y libpq-dev gcc && \ rm -rf /var/lib/apt/lists/* @@ -17,7 +13,7 @@ WORKDIR /app COPY pyproject.toml . COPY src ./src -RUN pip install --upgrade pip setuptools setuptools_scm +RUN pip install --upgrade pip setuptools RUN pip install --no-cache-dir . EXPOSE 8000 diff --git a/Makefile b/Makefile index 9a4dd63..acea176 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,6 @@ else endif XRM=xargs -0${_XRM_R} rm -# Provide version for container builds -export ANYVLM_VERSION := $(shell git describe --tags --abbrev=0 2>/dev/null || echo 0.0.0) ############################################################################ #= BASIC USAGE diff --git a/compose.dev.yaml b/compose.dev.yaml index 6b2aebc..f08c3c8 100644 --- a/compose.dev.yaml +++ b/compose.dev.yaml @@ -2,9 +2,6 @@ services: anyvlm: build: context: . - args: - # NOTE: Makefile sets this to ANYVLM_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo 0.0.0) - ANYVLM_VERSION: ${ANYVLM_VERSION:?ANYVLM_VERSION must be set to the AnyVLM version being used} depends_on: anyvlm_db: required: true diff --git a/docs/source/configuration/docker_compose.rst b/docs/source/configuration/docker_compose.rst index 8400213..742606f 100644 --- a/docs/source/configuration/docker_compose.rst +++ b/docs/source/configuration/docker_compose.rst @@ -22,10 +22,6 @@ The Docker Compose configuration is split across multiple files to separate conc * ``compose.dev.yaml`` Defines AnyVLM-specific development services, including FastAPI and PostgreSQL services built from local Dockerfiles. This file is intended for developers working on the AnyVLM codebase. - .. note:: - - ``compose.dev.yaml`` and the ``Dockerfile`` expect ``ANYVLM_VERSION`` to be set to the AnyVLM version being used (for example, ``1.0.0``) when running Docker Compose or building the image directly. This is handled automatically when using the Makefile. - * ``compose.anyvar.yaml`` Defines the services required to run the AnyVar REST service and its dependencies. This file is optional and is provided as a convenience for users who do not already have AnyVar running. diff --git a/docs/source/getting_started/docker_compose.rst b/docs/source/getting_started/docker_compose.rst index e3c6c0a..a08faf7 100644 --- a/docs/source/getting_started/docker_compose.rst +++ b/docs/source/getting_started/docker_compose.rst @@ -58,6 +58,6 @@ Full stack with AnyVar .. code-block:: console - % ANYVLM_VERSION=0.0.0 docker compose -f compose.dev.yaml -f compose.anyvar.yaml up --build + % docker compose -f compose.dev.yaml -f compose.anyvar.yaml up --build Once the containers are running, visit `http://127.0.0.1:8080 `_ to view the interactive Swagger UI and confirm the service is responding. diff --git a/pyproject.toml b/pyproject.toml index 58b7cf4..6b7be98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,6 @@ [project] name = "anyvlm" +version="1.0.0-rc2" authors = [ { name="biocommons contributors", email="biocommons-dev@googlegroups.com" }, ] @@ -31,7 +32,6 @@ dependencies = [ "pysam==0.23.0", # see https://github.com/ga4gh/vrs-python/issues/560 "pyyaml", ] -dynamic = ["version"] [project.optional-dependencies] test = [ @@ -70,16 +70,10 @@ Source = "https://github.com/genomicmedlab/anyvlm/" [project.scripts] anyvlm = "anyvlm.cli:_cli" - [build-system] -requires = [ - "setuptools >= 65.3", - "setuptools_scm >= 8" -] +requires = ["setuptools >= 65.3"] build-backend = "setuptools.build_meta" -[tool.setuptools_scm] - [tool.pytest.ini_options] addopts = "--cov=anyvlm --cov-report term-missing" testpaths = ["tests"]