Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
ANYVLM_VERSION: ${{ github.event.release.tag_name }}

steps:
- name: Checkout repository
Expand Down Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions docs/source/configuration/docker_compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/getting_started/docker_compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://127.0.0.1:8080>`_ to view the interactive Swagger UI and confirm the service is responding.
10 changes: 2 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[project]
name = "anyvlm"
version="1.0.0-rc2"
authors = [
{ name="biocommons contributors", email="biocommons-dev@googlegroups.com" },
]
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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"]
Expand Down