Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.2.3 #29

Merged
merged 13 commits into from
Jan 12, 2022
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
9 changes: 5 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
# Publish `main` as Docker `latest` image.
branches:
- main
- develop

# Publish `v1.2.3` tags as releases.
tags:
Expand All @@ -18,11 +19,9 @@ env:
IMAGE_NAME: ai-biopsy

jobs:

# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:

runs-on: ubuntu-latest
if: github.event_name == 'push'

Expand All @@ -33,7 +32,7 @@ jobs:
run: docker build . --file Dockerfile --tag $IMAGE_NAME

- name: Log into GitHub Container Registry
# TODO: Create a PAT with `read:packages` and `write:packages` scopes and save it as an Actions secret `CR_PAT`
# TODO: Create a PAT with `read:packages` and `write:packages` scopes and save it as an Actions secret `CR_PAT`
run: echo "${{ secrets.GHCR_TOKEN }}" | docker login https://ghcr.io -u ${{ secrets.GHCR_SVC_ACCOUNT }} --password-stdin

- name: Push image to GitHub Container Registry
Expand All @@ -51,6 +50,7 @@ jobs:

# Use Docker `latest` tag convention
[ "$VERSION" == "main" ] && VERSION=latest
[ "$VERSION" == "develop" ] && VERSION=develop

echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
Expand All @@ -63,7 +63,7 @@ jobs:
with:
username: ${{ secrets.EIPM_DOCKER_HUB_USERNAME }}
password: ${{ secrets.EIPM_DOCKER_HUB_TOKEN }}

- name: Push image to EIPM Docker Hub
run: |
IMAGE_ID=eipm/$IMAGE_NAME
Expand All @@ -79,6 +79,7 @@ jobs:

# Use Docker `latest` tag convention
[ "$VERSION" == "main" ] && VERSION=latest
[ "$VERSION" == "develop" ] && VERSION=develop

echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Source code for manuscript:
<img src="docs/images/logo.png" width="256">
</p>

[![Actions Status](https://github.com/eipm/ai-biopsy/workflows/Docker/badge.svg)](https://github.com/eipm/ai-biopsy/actions) [![Github](https://img.shields.io/badge/github-1.2.2-green?style=flat&logo=github)](https://github.com/eipm/ai-biopsy) [![EIPM Docker Hub](https://img.shields.io/badge/EIPM%20docker%20hub-1.2.2-blue?style=flat&logo=docker)](https://hub.docker.com/repository/docker/eipm/ai-biopsy) [![GitHub Container Registry](https://img.shields.io/badge/GitHub%20Container%20Registry-1.2.2-blue?style=flat&logo=docker)](https://github.com/orgs/eipm/packages/container/package/ai-biopsy) [![Python 3.7.9](https://img.shields.io/badge/python-3.7.9-blue.svg)](https://www.python.org/downloads/release/python-379/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Actions Status](https://github.com/eipm/ai-biopsy/workflows/Docker/badge.svg)](https://github.com/eipm/ai-biopsy/actions) [![Github](https://img.shields.io/badge/github-1.2.3-green?style=flat&logo=github)](https://github.com/eipm/ai-biopsy) [![EIPM Docker Hub](https://img.shields.io/badge/EIPM%20docker%20hub-1.2.3-blue?style=flat&logo=docker)](https://hub.docker.com/repository/docker/eipm/ai-biopsy) [![GitHub Container Registry](https://img.shields.io/badge/GitHub%20Container%20Registry-1.2.3-blue?style=flat&logo=docker)](https://github.com/orgs/eipm/packages/container/package/ai-biopsy) [![Python 3.7.9](https://img.shields.io/badge/python-3.7.9-blue.svg)](https://www.python.org/downloads/release/python-379/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

## AI Biopsy Requirements

Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ grpcio==1.32.0
h5py==2.10.0
idna==2.10
itsdangerous==1.1.0
Jinja2==2.11.2
Jinja2==2.11.3
Keras-Applications==1.0.8
Keras-Preprocessing==1.0.5
Markdown==3.2.2
MarkupSafe==1.1.1
numpy==1.16.0
numpy==1.18.5
protobuf==3.13.0
pyasn1==0.4.4
pyasn1-modules==0.2.2
pytz==2018.5
requests==2.24.0
rsa==4.6
requests==2.27.1
rsa==4.7
selenium==3.141.0
six==1.15.0
tensorboard==1.15.0
Expand All @@ -33,7 +33,7 @@ termcolor==1.1.0
urllib3==1.26.5
virtualenv==20.0.31
Werkzeug==1.0.1
opencv-python==4.0.0.21
opencv-python==4.2.0.32
matplotlib==3.3.2
pydicom==2.0.0
pypng==0.0.20
2 changes: 1 addition & 1 deletion src/api/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = '1.2.2'
version = '1.2.3'


def api_version():
Expand Down
2 changes: 1 addition & 1 deletion src/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h6>Results</h6>
</div>
<footer>
<div>Copyright © <span id="year"></span> Englander Institute for Precision Medicine</div>
<div>AI Biopsy Version 1.2.2</div>
<div>AI Biopsy Version 1.2.3</div>
<img alt="logo" class="footer-logo" src="assets/LOGO_ENGLANDER_2LINE_RGB.png">
</footer>

Expand Down
2 changes: 1 addition & 1 deletion src/static/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h5 class="login-title">Log in</h5>
</div>
<footer>
<div>Copyright © <span id="year"></span> Englander Institute for Precision Medicine</div>
<div>AI Biopsy Version 1.2.2</div>
<div>AI Biopsy Version 1.2.3</div>
<img alt="logo" class="footer-logo" src="assets/LOGO_ENGLANDER_2LINE_RGB.png">
</footer>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.1/jquery.min.js"></script>
Expand Down