From 72406ae5e9e1bf5a457a457766ffe27743c4ee7e Mon Sep 17 00:00:00 2001 From: Samuel Letellier-Duchesne Date: Thu, 14 Sep 2023 16:38:30 -0400 Subject: [PATCH] Package requires looser requirements versions (#493) * looser requirements * test --- archetypal/__init__.py | 6 +++--- requirements.txt | 27 +++++++++++++-------------- tests/test_energypandas.py | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/archetypal/__init__.py b/archetypal/__init__.py index d3e810c7..294ba215 100644 --- a/archetypal/__init__.py +++ b/archetypal/__init__.py @@ -12,8 +12,8 @@ # Version of the package from pkg_resources import get_distribution, DistributionNotFound +from pydantic_settings import BaseSettings from pydantic import ( - BaseSettings, Field, validator, DirectoryPath, @@ -62,7 +62,7 @@ class Config: cache_responses: bool = Field(False, env="ARCHETYPAL_CACHE_RESPONSES") # Debug behavior - debug = Field(False, env="ARCHETYPAL_DEBUG") + debug: bool = Field(False, env="ARCHETYPAL_DEBUG") # write log to file and/or to console log_file: bool = Field(False) @@ -166,7 +166,7 @@ class Config: Errors={"PrimaryKey": ["ErrorIndex"], "ParseDates": []}, ) - zone_weight = ZoneWeight(n=0) + zone_weight: ZoneWeight = ZoneWeight(n=0) ep_version: str = Field( "9-2-0", diff --git a/requirements.txt b/requirements.txt index cb35866e..9d28c85f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,20 +5,19 @@ pycountry~=20.7.3 scikit-learn~=1.0.2 pandas>=1.2.0,<2.0 numpy>=1.17 -tqdm~=4.61.2 +tqdm tabulate~=0.8.9 path~=16.0.0 -click~=8.0.1 -outdated~=0.2.1 -deprecation~=2.1.0 -sigfig~=1.1.9 -requests~=2.25.1 -packaging~=21.0 -pytest~=6.2.4 -setuptools==67.7.2 +click +outdated +deprecation +sigfig +requests +packaging +setuptools CoolProp~=6.4.1 -energy-pandas~=0.3.3 -validator_collection~=1.5.0 -pint==0.19 -typing_extensions==4.3.0 -pydantic \ No newline at end of file +energy-pandas +validator_collection +pint<=0.19 +typing_extensions +pydantic-settings \ No newline at end of file diff --git a/tests/test_energypandas.py b/tests/test_energypandas.py index 35c1242e..972c587b 100644 --- a/tests/test_energypandas.py +++ b/tests/test_energypandas.py @@ -51,7 +51,7 @@ def test_plot_3d(self, rd_es, kind): kind=kind, cmap="Reds", figsize=(4, 4), - edgecolors="grey", + # edgecolors="grey", linewidths=0.01, )