Skip to content

Commit

Permalink
Merge branch 'main' into polaris
Browse files Browse the repository at this point in the history
  • Loading branch information
tomuram authored Oct 5, 2022
2 parents 8745c78 + bb1fc16 commit 9b72e57
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: set up python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Balsam
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python env
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install mpich
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Push to Docker Hub
uses: docker/build-push-action@v2.10.0
uses: docker/build-push-action@v3.0.0
with:
push: true
tags: masalim2/balsam:latest
2 changes: 1 addition & 1 deletion .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.8'

Expand Down
2 changes: 1 addition & 1 deletion balsam/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from balsam.util import config_root_logger

__version__ = "0.7.0.a11"
__version__ = "0.7.0.a16"
config_root_logger()
16 changes: 8 additions & 8 deletions requirements/deploy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ psycopg2==2.9.3
fastapi==0.78.0
orjson==3.6.8
fastapi==0.78.0
uvicorn[standard]==0.17.6
uvicorn[standard]==0.18.3
python-multipart==0.0.5
gunicorn==20.1.0
PyJWT==2.4.0
passlib[bcrypt]==1.7.4
alembic==1.7.7
SQLAlchemy==1.4.36
alembic==1.8.1
SQLAlchemy==1.4.41
aredis==1.1.8
redis==4.3.1
redis==4.3.4

# Duplicated from setup.cfg (but pinned)
PyYAML==6.0
multiprocessing-logging==0.3.3
click==8.1.3
inquirer==2.9.2
pydantic==1.9.1
python-dotenv==0.20.0
python-dotenv==0.21.0
python-dateutil==2.8.2
Jinja2==3.1.2
requests==2.27.1
psutil==5.9.1
globus-sdk==3.8.0
requests==2.28.1
psutil==5.9.2
globus-sdk==3.11.0
configobj==5.0.6
pyzmq==22.3.0
dill==0.3.5.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Pinned deployment dependencies:
-r deploy.txt

mypy==0.960
mypy==0.971
mkdocs-material>=7.1.9,<9.0.0
coverage
black
Expand Down

0 comments on commit 9b72e57

Please sign in to comment.