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
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
SHELL := /bin/bash

INFRAGRAPH_VERSION := $(shell cat .INFRAGRAPH_VERSION)
ASTRA_SIM_SERVICE_IMAGE := astrasim/astra-sim-service
ASTRA_SIM_SERVICE_LATEST := $(ASTRA_SIM_SERVICE_IMAGE):latest
VERSION := $(shell cat .VERSION)
Expand All @@ -15,9 +14,6 @@ install-prerequisites:
cd client-scripts && make install-prerequisites
cd service && make install-prerequisites
pip install -r requirements.txt
wget https://github.com/Keysight/infragraph/releases/download/v${INFRAGRAPH_VERSION}/infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl
pip install infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl
rm -f infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl

.PHONY: version
version:
Expand Down Expand Up @@ -48,9 +44,7 @@ build-service:

.PHONY: build-service-docker
build-service-docker: install-prerequisites version build-models
cp .INFRAGRAPH_VERSION service/
cd service && make build-docker
rm service/.INFRAGRAPH_VERSION

.PHONY: build-astra-sim
build-astra-sim:
Expand Down
2 changes: 1 addition & 1 deletion models/schema/api/api.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
title: ASTRA-sim APIs
version: 1.2.1
version: 1.2.2
description: The ASTRA-sim API provides a standardized interface for submitting configurations, executing jobs, checking job status, and retrieving results.
license:
name: MIT
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ semantic-version
jupyterlab-lsp
semantic-version
jupytext
infragraph

8 changes: 1 addition & 7 deletions service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ WORKDIR /app

# Copy the commit SHA file into the image
COPY .ASTRA_SIM_GIT_COMMIT_SHA /tmp/.ASTRA_SIM_GIT_COMMIT_SHA
# Copy the infragraph version file into the image
COPY .INFRAGRAPH_VERSION /tmp/.INFRAGRAPH_VERSION
# Clone the repo and checkout the commit from the file
RUN REPO=https://github.com/astra-sim/astra-sim.git && \
COMMIT_SHA=$(cat /tmp/.ASTRA_SIM_GIT_COMMIT_SHA) && \
Expand All @@ -58,11 +56,7 @@ COPY requirements.txt /app/requirements.txt
COPY *.whl /app/
RUN chmod +x build_script/build_backend.sh
RUN ./build_script/build_backend.sh
# Install infragraph from GitHub release
RUN INFRAGRAPH_VERSION=$(cat /tmp/.INFRAGRAPH_VERSION) && \
wget https://github.com/Keysight/infragraph/releases/download/v${INFRAGRAPH_VERSION}/infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl && \
pip install infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl && \
rm -f infragraph-${INFRAGRAPH_VERSION}-py3-none-any.whl

RUN pip install *.whl
RUN pip install --no-cache-dir -r /app/requirements.txt

Expand Down
Loading