Skip to content

Commit 5fa4dd8

Browse files
authored
Merge pull request #61 from fractal-analytics-platform/dev
dev to main (require fractal-tasks-core 0.1.4)
2 parents 2ac21e9 + e2b8c37 commit 5fa4dd8

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

fractal_server/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
from fastapi import FastAPI
1414
from fastapi.middleware.cors import CORSMiddleware
1515

16+
__VERSION__ = "0.1.2"
17+
1618

1719
def collect_routers(app: FastAPI) -> None:
1820
from .app.api import router_default

fractal_server/config.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
from pydantic import Field
2424
from pydantic import root_validator
2525

26+
import fractal_server
27+
2628

2729
def fail_getenv(key):
2830
value = getenv(key, None)
@@ -45,9 +47,6 @@ class OAuthClient(BaseModel):
4547
REVOKE_TOKEN_ENDPOINT: Optional[str]
4648

4749

48-
__VERSION__ = "0.1.2"
49-
50-
5150
class DeploymentType(str, Enum):
5251
PRODUCTION = "production"
5352
STAGING = "staging"
@@ -57,7 +56,7 @@ class DeploymentType(str, Enum):
5756

5857
class Settings(BaseSettings):
5958
PROJECT_NAME: str = "Fractal Server"
60-
PROJECT_VERSION: str = __VERSION__
59+
PROJECT_VERSION: str = fractal_server.__VERSION__
6160
DEPLOYMENT_TYPE: DeploymentType = DeploymentType(
6261
fail_getenv("DEPLOYMENT_TYPE")
6362
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ push = true
6666
"pyproject.toml" = [
6767
'version = "{version}"',
6868
]
69-
"fractal_server/config.py" = [
69+
"fractal_server/__init__.py" = [
7070
'__VERSION__ = "{version}"'
7171
]
7272

0 commit comments

Comments
 (0)