From 8467ac5accf5bc59ac5511ba9a95bdfe6315aba3 Mon Sep 17 00:00:00 2001 From: Henrique Joaquim Date: Fri, 17 Nov 2023 11:43:45 +0000 Subject: [PATCH] Hotfix/urllib to dev group (#5732) * use the urllib3 dependency on the dev group instead * adapt the version script for the nightlies - if it's a nightly the package distribution name will have a different name * add dev dependencies to the dev installation bc of the ci * updating the import on validate_call according to: https://docs.pydantic.dev/latest/concepts/validation_decorator/ the way we were importing it breaks if pydantic=2.5 @montezdesousa * loosing urllib3 version specification on the provider and adding it to platform dev deps * rmeoving urllib from top level deps; and removing --with dev flag * changing to ^ instead * Revert "changing to ^ instead" This reverts commit 7300904e9f3adba372b106d381b70ae06e28795a. * unnecessary dep --------- Co-authored-by: Theodore Aptekarev Co-authored-by: James Maslek --- .../platform/core/openbb_core/app/static/decorators.py | 3 ++- .../platform/core/openbb_core/app/version.py | 10 ++++++++-- openbb_platform/platform/provider/pyproject.toml | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/openbb_platform/platform/core/openbb_core/app/static/decorators.py b/openbb_platform/platform/core/openbb_core/app/static/decorators.py index 8d379864724..e664f0b1cf7 100644 --- a/openbb_platform/platform/core/openbb_core/app/static/decorators.py +++ b/openbb_platform/platform/core/openbb_core/app/static/decorators.py @@ -1,7 +1,8 @@ +"""Decorators for the OpenBB Platform static assets.""" from functools import wraps from typing import Any, Callable, Optional, TypeVar, overload -from pydantic.validate_call import validate_call +from pydantic import validate_call from typing_extensions import ParamSpec P = ParamSpec("P") diff --git a/openbb_platform/platform/core/openbb_core/app/version.py b/openbb_platform/platform/core/openbb_core/app/version.py index b6f76529adf..c53858bf55a 100644 --- a/openbb_platform/platform/core/openbb_core/app/version.py +++ b/openbb_platform/platform/core/openbb_core/app/version.py @@ -10,9 +10,15 @@ PACKAGE = "openbb" def get_package_version(package: str): """Retrieve the version of a package from installed pip packages.""" - version = pkg_resources.get_distribution(package).version + is_nightly = False + try: + version = pkg_resources.get_distribution(package).version + except pkg_resources.DistributionNotFound: + package += "-nightly" + is_nightly = True + version = pkg_resources.get_distribution(package).version - if is_git_repo(Path(__file__).parent.resolve()): + if is_git_repo(Path(__file__).parent.resolve()) and not is_nightly: version += "dev" return version diff --git a/openbb_platform/platform/provider/pyproject.toml b/openbb_platform/platform/provider/pyproject.toml index 422464c7c10..b05116256d6 100644 --- a/openbb_platform/platform/provider/pyproject.toml +++ b/openbb_platform/platform/provider/pyproject.toml @@ -11,9 +11,10 @@ python = "^3.8" importlib_metadata = "^6.8.0" pydantic = "^2.4.2" requests = "^2.31.0" -urllib3 = "<2.0.0" importlib-metadata = "^6.8.0" python-dotenv = "^1.0.0" + +[tool.poetry.group.dev.dependencies] pytest-recorder = "^0.2.3" [build-system]