dataconf 3.2.0__tar.gz → 3.3.0__tar.gz

{dataconf-3.2.0 → dataconf-3.3.0}/PKG-INFO

@@ -1,28 +1,24 @@
 Metadata-Version: 2.1
 Name: dataconf
-Version: 3.2.0
+Version: 3.3.0
 Summary: Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support.
 Home-page: https://github.com/zifeo/dataconf
 License: MPL-2.0
 Keywords: configuration,dataclasses,yaml,hocon,json,properties,cli,environment variables
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
+Requires-Dist: PyYAML (>=6.0.2,<7.0.0)
 Requires-Dist: isodate (>=0.6.1,<0.7.0)
 Requires-Dist: pyhocon (>=0.3.61,<0.4.0)
-Requires-Dist: pyparsing (>=3.1.2,<4.0.0)
-Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
+Requires-Dist: pyparsing (>=3.1.4,<4.0.0)
+Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
 Project-URL: Repository, https://github.com/zifeo/dataconf
 Description-Content-Type: text/markdown
 
@@ -36,7 +32,7 @@ hocon/json/yaml/properties/env-vars/dict/cli support.
 
 ## Getting started
 
-Requires at least Python 3.8.
+Requires at least Python 3.9.
 
 ```bash
 # pypi
@@ -105,11 +101,11 @@ zone {
 
 class AbstractBaseClass:
     pass
-    
+
 @dataclass
 class Person(AbstractBaseClass):
     name: Text
-        
+
 @dataclass
 class Zone(AbstractBaseClass):
     area_code: int

{dataconf-3.2.0 → dataconf-3.3.0}/README.md

@@ -8,7 +8,7 @@ hocon/json/yaml/properties/env-vars/dict/cli support.
 
 ## Getting started
 
-Requires at least Python 3.8.
+Requires at least Python 3.9.
 
 ```bash
 # pypi
@@ -77,11 +77,11 @@ zone {
 
 class AbstractBaseClass:
     pass
-    
+
 @dataclass
 class Person(AbstractBaseClass):
     name: Text
-        
+
 @dataclass
 class Zone(AbstractBaseClass):
     area_code: int

{dataconf-3.2.0 → dataconf-3.3.0}/dataconf/exceptions.py

@@ -34,6 +34,12 @@ class EnvListOrderException(Exception):
     pass
 
 
+class EnvListFormatException(Exception):
+    """Format exception."""
+
+    pass
+
+
 class ParseException(Exception):
     """Parsing exception."""
 

{dataconf-3.2.0 → dataconf-3.3.0}/dataconf/utils.py

@@ -17,7 +17,7 @@ from typing import List
 from typing import Type
 from typing import Union
 
-from dataconf.exceptions import AmbiguousSubclassException
+from dataconf.exceptions import AmbiguousSubclassException, EnvListFormatException
 from dataconf.exceptions import EnvListOrderException
 from dataconf.exceptions import MalformedConfigException
 from dataconf.exceptions import MissingTypeException
@@ -333,6 +333,8 @@ def __env_vars_parse(prefix: str, obj: Dict[str, Any]):
         if len(p) == 1:
             # []x
             if isinstance(focus, list):
+                if not isinstance(p[0], int):
+                    raise EnvListFormatException
                 if p[0] != len(focus):
                     raise EnvListOrderException
                 focus.append(v)
@@ -346,9 +348,8 @@ def __env_vars_parse(prefix: str, obj: Dict[str, Any]):
             if p[0] not in focus:
                 # []{x}
                 if isinstance(focus, list):
-                    if p[0] != len(focus):
-                        raise EnvListOrderException
-                    focus.append({})
+                    if p[0] == len(focus):
+                        focus.append({})
                 # {}{x}
                 else:
                     focus[p[0]] = {}

{dataconf-3.2.0 → dataconf-3.3.0}/dataconf/version.py

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "3.2.0"
+__version__ = "3.3.0"
 
 PY310up = sys.version_info >= (3, 10)
 PY311up = sys.version_info >= (3, 11)

{dataconf-3.2.0 → dataconf-3.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dataconf"
-version = "3.2.0"
+version = "3.3.0"
 description = "Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support."
 authors = []
 license = "MPL-2.0"
@@ -12,10 +12,10 @@ include = [
 classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11"
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12"
 ]
 keywords = [
     "configuration",
@@ -32,23 +32,23 @@ keywords = [
 dataconf = 'dataconf.cli:run'
 
 [tool.poetry.dependencies]
-python = "^3.8"
-python-dateutil = "^2.8.2"
-PyYAML = "^6.0.1"
+python = "^3.9"
+python-dateutil = "^2.9.0.post0"
+PyYAML = "^6.0.2"
 isodate = "^0.6.1"
 pyhocon = "^0.3.61"
-pyparsing = "^3.1.2"
+pyparsing = "^3.1.4"
 
 [tool.poetry.group.dev.dependencies]
-pytest = ">=7.4.2,<9.0.0"
-pre-commit = ">=2.21,<4.0"
-commitizen = ">=2.42.1,<4.0.0"
-pytest-httpserver = "^1.0.8"
-ruff = ">=0.1.9,<0.5.0"
+pytest = ">=8.3.3"
+pre-commit = ">=3.8.0"
+commitizen = ">=3.29.0"
+pytest-httpserver = "^1.1.0"
+ruff = ">=0.6.5"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "3.2.0"
+version = "3.3.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 version_files = [
     "pyproject.toml:version",

dataconf-3.2.0/setup.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['dataconf']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['PyYAML>=6.0.1,<7.0.0',
- 'isodate>=0.6.1,<0.7.0',
- 'pyhocon>=0.3.61,<0.4.0',
- 'pyparsing>=3.1.2,<4.0.0',
- 'python-dateutil>=2.8.2,<3.0.0']
-
-entry_points = \
-{'console_scripts': ['dataconf = dataconf.cli:run']}
-
-setup_kwargs = {
-    'name': 'dataconf',
-    'version': '3.2.0',
-    'description': 'Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support.',
-    'long_description': '# Dataconf\n\n[![Actions Status](https://github.com/zifeo/dataconf/actions/workflows/test-release.yaml/badge.svg)](https://github.com/zifeo/dataconf/actions)\n[![PyPI version](https://badge.fury.io/py/dataconf.svg)](https://badge.fury.io/py/dataconf)\n\nSimple dataclasses configuration management for Python with\nhocon/json/yaml/properties/env-vars/dict/cli support.\n\n## Getting started\n\nRequires at least Python 3.8.\n\n```bash\n# pypi\npip install dataconf\npoetry add dataconf\n\n# remote master\npip install --upgrade git+https://github.com/zifeo/dataconf.git\npoetry add git+https://github.com/zifeo/dataconf.git\n\n# local repo/dev\npoetry install\npre-commit install\n```\n\n## Usage\n\n```python\nimport os\nfrom dataclasses import dataclass, field\nfrom typing import List, Dict, Text, Union, Tuple\nfrom dateutil.relativedelta import relativedelta\nfrom datetime import datetime, timedelta\nimport dataconf\n\nconf = """\nstr_name = test\nstr_name = ${?HOME}\ndash-to-underscore = true\nfloat_num = 2.2\niso_datetime = "2000-01-01T20:00:00"\niso_duration = "P123DT4H5M6S"\nvariable_length_tuple_data = [\n    1\n    2\n    3\n]\ntuple_data = [\n    a\n    P1D\n]\n# this is a comment\nlist_data = [\n    a\n    b\n]\nnested {\n    a = test\n    b : 1\n}\nnested_list = [\n    {\n        a = test1\n        b : 2.5\n    }\n]\nduration = 2s\nunion = 1\npeople {\n    name = Thailand\n}\nzone {\n    area_code = 42\n}\n"""\n\nclass AbstractBaseClass:\n    pass\n    \n@dataclass\nclass Person(AbstractBaseClass):\n    name: Text\n        \n@dataclass\nclass Zone(AbstractBaseClass):\n    area_code: int\n\n@dataclass\nclass Nested:\n    a: Text\n    b: float\n\n@dataclass\nclass Config:\n    str_name: Text\n    dash_to_underscore: bool\n    float_num: float\n    iso_datetime: datetime\n    iso_duration: timedelta\n    variable_length_tuple_data: Tuple[int, ...]\n    tuple_data: Tuple[Text, timedelta]\n    list_data: List[Text]\n    nested: Nested\n    nested_list: List[Nested]\n    duration: relativedelta\n    union: Union[Text, int]\n    people: AbstractBaseClass\n    zone: AbstractBaseClass\n    default: Text = \'hello\'\n    default_factory: Dict[Text, Text] = field(default_factory=dict)\n\nprint(dataconf.string(conf, Config))\n# Config(\n#   str_name=\'/users/root/\',\n#   dash_to_underscore=True,\n#   float_num=2.2,\n#   iso_datetime=datetime.datetime(2000, 1, 1, 20, 0),\n#   iso_duration=datetime.timedelta(days=123, seconds=14706),\n#   variable_length_tuple_data=(1,2,3),\n#   tuple_data=(\'a\', datetime.timedelta(days=1)),\n#   list_data=[\'a\', \'b\'],\n#   nested=Nested(a=\'test\', b=1),\n#   nested_list=[Nested(a=\'test1\', b=2.5)],\n#   duration=relativedelta(seconds=+2),\n#   union=1,\n#   people=Person(name=\'Thailand\'),\n#   zone=Zone(area_code=42),\n#   default=\'hello\',\n#   default_factory={}\n# )\n\n@dataclass\nclass Example:\n    hello: str\n    world: str\n    foo: List[str]\n\nos.environ[\'DC_WORLD\'] = \'monde\'\n\nprint(\n    dataconf\n    .multi\n    .url(\'https://raw.githubusercontent.com/zifeo/dataconf/main/confs/simple.hocon\')\n    .env(\'DC\')\n    .on(Example)\n)\n# Example(hello=\'bonjour\',world=\'monde\')\n```\n\n## API\n\n```python\nimport dataconf\n\nconf = dataconf.string(\'{ name: Test }\', Config)\nconf = dataconf.string(\'name:\\n\\tvalue: Test\', Config, loader=dataconf.YAML)  # dataconf.HOCON by default\nconf = dataconf.env(\'PREFIX_\', Config)\nconf = dataconf.dict({\'name\': \'Test\'}, Config)\nconf = dataconf.url(\'https://raw.githubusercontent.com/zifeo/dataconf/master/confs/test.hocon\', Config)  # hocon, json, yaml, properties\nconf = dataconf.file(\'confs/test.hocon\', Config)  # hocon, json, yaml, properties\nconf = dataconf.cli(sys.argv, Config)\n\n# Aggregation\nconf = dataconf.multi.string(...).env(...).url(...).file(...).dict(...).cli(...).on(Config)\n\n# Same api as Python json/yaml packages (e.g. `load`, `loads`, `dump`, `dumps`)\nconf = dataconf.load(\'confs/test.hocon\', Config)  # hocon, json, yaml, properties\nconf = dataconf.load(\'confs/test.yaml\', Config, loader=dataconf.YAML)  # dataconf.HOCON by default\ndataconf.dump(\'confs/test.hocon\', conf, out=\'hocon\')\ndataconf.dump(\'confs/test.json\', conf, out=\'json\')\ndataconf.dump(\'confs/test.yaml\', conf, out=\'yaml\')\ndataconf.dump(\'confs/test.properties\', conf, out=\'properties\')\n```\n\nFor full HOCON capabilities see\n[here](https://github.com/chimpler/pyhocon/#example-of-hocon-file).\n\n## Parse env vars\n\n```bash\nPREFIX_VAR=a\nPREFIX_VAR_NAME=b\nPREFIX_TEST__NAME=c\nPREFIX_LS_0=d\nPREFIX_LS_1=e\nPREFIX_LSLS_0_0=f\nPREFIX_LSOB_0__NAME=g\nPREFIX_NESTED_="{ name: Test }"\nPREFIX_SUB_="{ value: ${PREFIX_VAR} }"\n```\n\nis equivalent to\n\n```\n{\n    var = a\n    var_name = b\n    test {\n        name = c\n    }\n    ls = [\n        d\n        e\n    ]\n    lsls = [\n        [\n            f\n        ]\n    ]\n    lsob = [\n        {\n            name = g\n        }\n    ]\n    nested {\n        # parse nested config by suffixing env var with `_`\n        name: Test\n    }\n    sub {\n        # will have value "a" at parsing, useful for aliases\n        value = ${PREFIX_VAR}\n    }\n}\n```\n\nNote that when using `.env` source, the strict mode is disabled and value might\nbe casted.\n\n## Parse CLI arguments\n\nSame as env vars parse (dashes are converted to underscore, e.g. `TEST_A` →\n`--test-a`).\n\n## CLI usage\n\nCan be used for validation or converting between supported file formats (`-o`).\n\n```shell\ndataconf -c confs/test.hocon -m tests.configs -d TestConf -o hocon\n# dataconf.exceptions.TypeConfigException: expected type <class \'datetime.timedelta\'> at .duration, got <class \'int\'>\n```\n',
-    'author': 'None',
-    'author_email': 'None',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://github.com/zifeo/dataconf',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'entry_points': entry_points,
-    'python_requires': '>=3.8,<4.0',
-}
-
-
-setup(**setup_kwargs)