Skip to content

Commit

Permalink
added code review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ZohebShaikh committed Aug 29, 2024
1 parent d42db2b commit bf187f0
Show file tree
Hide file tree
Showing 9 changed files with 420 additions and 425 deletions.
8 changes: 2 additions & 6 deletions .github/actions/install_requirements/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@ runs:
python-version: ${{ env.PYTHON_VERSION }}

- name: Install packages
run: pip install $([ -f dev-requirements.txt ] && echo '-c dev-requirements.txt') -e .[dev]
shell: bash

- name: Install bluesky_stomp
run: pip install git+https://github.com/DiamondLightSource/bluesky-stomp.git@main
run: pip install ${{ inputs.pip-install }}
shell: bash

- name: Report what was installed
run: pip freeze
shell: bash
shell: bash
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ FROM developer as build
COPY . /context
WORKDIR /context
RUN touch dev-requirements.txt && pip install --upgrade pip && pip install -c dev-requirements.txt .
RUN pip install git+https://github.com/DiamondLightSource/bluesky-stomp.git@main

# The runtime stage copies the built venv into a slim runtime container
FROM python:${PYTHON_VERSION}-slim as runtime
Expand All @@ -32,4 +31,4 @@ ENV PATH=/venv/bin:$PATH
RUN mkdir -p /.cache/pip; chmod -R 777 /venv /.cache/pip

ENTRYPOINT ["blueapi"]
CMD ["serve"]
CMD ["serve"]
6 changes: 3 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bidict==0.23.1
bluesky==1.13.0a4
bluesky-kafka==0.10.0
bluesky-live==0.0.8
bluesky-stomp @ git+https://github.com/DiamondLightSource/bluesky-stomp@4dbdb6b144b4b03243a1784f2f53dc13cbbef30e
bluesky-stomp==0.1.0
boltons==24.0.0
cachetools==5.5.0
caproto==1.1.1
Expand Down Expand Up @@ -213,10 +213,10 @@ tzlocal==5.2
urllib3==2.2.2
uvicorn==0.30.6
virtualenv==20.26.3
watchfiles==0.23.0
watchfiles==0.24.0
wcwidth==0.2.13
websocket-client==1.8.0
websockets==13.0
websockets==13.0.1
widgetsnbextension==4.0.13
workflows==2.27
xarray==2024.7.0
Expand Down
Loading

0 comments on commit bf187f0

Please sign in to comment.