Skip to content

Commit

Permalink
Merge branch 'main' into add-black
Browse files Browse the repository at this point in the history
# Conflicts:
#	requirements.txt
  • Loading branch information
henrikstranneheim committed Mar 6, 2024
2 parents f5cce5e + ba109e3 commit e382d32
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.2
current_version = 2.0.4
commit = True
tag = True
tag_name = v{new_version}
Expand Down
2 changes: 1 addition & 1 deletion genotype_api/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.0.2"
__version__ = "2.0.4"
34 changes: 18 additions & 16 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
SQLAlchemy==1.4.30
aiofiles
bcrypt
bump2version
click
pyyaml
coloredlogs
bump2version
pymysql
sqlmodel
openpyxl
SQLAlchemy==1.4.30

# server stuff
passlib
email-validator
fastapi==0.75.0
uvicorn
uvloop
httptools
google-auth
gunicorn
python-jose[cryptography]
bcrypt
httptools
numpy
aiofiles
openpyxl
passlib
pydantic==1.10.14
pymysql
python-dotenv
google-auth
python-jose[cryptography]
python-multipart
pyyaml
requests
sqlmodel
uvicorn
uvloop
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name="genotype_api",
version="2.0.2",
version="2.0.4",
description="",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit e382d32

Please sign in to comment.