Merge branch 'main' into clean-actions

# Conflicts: # .github/workflows/merge_master_ci.yml # .github/workflows/pull_request_ci.yml # requirements.txt
Clinical-Genomics · Mar 6, 2024 · 95b5aa6 · 95b5aa6
2 parents cc4d047 + 44d0c18
commit 95b5aa6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.2
+current_version = 2.0.5
 commit = True
 tag = True
 tag_name = v{new_version}

diff --git a/.github/workflows/merge_master_ci.yml b/.github/workflows/merge_master_ci.yml
diff --git a/.github/workflows/pull_request_ci.yml b/.github/workflows/pull_request_ci.yml
diff --git a/genotype_api/__init__.py b/genotype_api/__init__.py
@@ -1 +1 @@
-__version__ = "2.0.2"
+__version__ = "2.0.5"
diff --git a/requirements.txt b/requirements.txt
@@ -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
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name="genotype_api",
-    version="2.0.2",
+    version="2.0.5",
     description="",
     long_description=long_description,
     long_description_content_type="text/markdown",