From e9a847c390db799abf7c39867026f5771d978f45 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Tue, 30 Jul 2024 19:55:12 +0200 Subject: [PATCH] v1.6.3312 --- dotgitconfig.py | 2 +- dotnetrc.py | 2 +- jira2data.py | 2 +- jira2data_api.py | 2 +- jira2data_api_mockup.py | 2 +- odoo2data.py | 2 +- odoo2data.tests.py | 2 +- odoo2data_api.py | 2 +- odoo2data_api_mockup.py | 2 +- odoo2data_xmlrpc.py | 2 +- odootopic.py | 2 +- odootopic.tests.py | 2 +- setup.cfg | 2 +- setup.tabxlsx.cfg | 5 ++++- tabtofmt.tests.py | 2 +- tabtools.py | 2 +- tabtools.tests.py | 2 +- tabtotext.py | 2 +- tabtotext.setup.md | 9 +++++++++ tabtotext.tests.py | 2 +- tabtoxlsx.py | 2 +- tabxlsx.tests.py | 2 +- timerange.py | 2 +- timerange.tests.py | 2 +- timetrack.py | 2 +- timetrack.tests.py | 2 +- zeit2jira.py | 2 +- zeit2jira.tests.py | 2 +- zeit2json.py | 2 +- zeit2json.tests.py | 2 +- zeit2odoo.py | 2 +- zeit2odoo.tests.py | 2 +- 32 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dotgitconfig.py b/dotgitconfig.py index 8751ec3..ee204e5 100755 --- a/dotgitconfig.py +++ b/dotgitconfig.py @@ -4,7 +4,7 @@ adding functions to read the the gitconfig settings alternativly. """ __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.1.3283" +__version__ = "1.1.3312" from typing import List, Dict, Tuple, Optional diff --git a/dotnetrc.py b/dotnetrc.py index 61592c7..762456c 100755 --- a/dotnetrc.py +++ b/dotnetrc.py @@ -6,7 +6,7 @@ where extensions should only be used in a ~/.net-credentials filename. //// Use command './dotnetrc.py set ' to write entries.""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" # dot git-credentials format: # https://:@ diff --git a/jira2data.py b/jira2data.py index f106da5..7acc697 100755 --- a/jira2data.py +++ b/jira2data.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" from typing import Union, Dict, List, Any, Optional, Tuple, Iterable, Iterator, cast from requests import Session, Response, HTTPError diff --git a/jira2data_api.py b/jira2data_api.py index d0ddde8..48ecee8 100755 --- a/jira2data_api.py +++ b/jira2data_api.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" from typing import Union, Dict, List, Any, Optional, Tuple, Iterable, Iterator, cast from requests import Session, Response, HTTPError diff --git a/jira2data_api_mockup.py b/jira2data_api_mockup.py index 8568fde..c558260 100755 --- a/jira2data_api_mockup.py +++ b/jira2data_api_mockup.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" from typing import Union, Dict, List, Any, Optional, Tuple, Iterable, Iterator, cast from requests import Session, Response, HTTPError diff --git a/odoo2data.py b/odoo2data.py index 11ccbfb..a4a836c 100755 --- a/odoo2data.py +++ b/odoo2data.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" from typing import Optional, Union, Dict, List, Tuple, cast, Iterable, Iterator diff --git a/odoo2data.tests.py b/odoo2data.tests.py index 4cf0d62..5c5e81a 100755 --- a/odoo2data.tests.py +++ b/odoo2data.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" import tabtotext import odoo2data_api_mockup as odoo_api_mockup diff --git a/odoo2data_api.py b/odoo2data_api.py index 9396fff..4e23559 100755 --- a/odoo2data_api.py +++ b/odoo2data_api.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.7.3283" +__version__ = "0.7.3312" import logging from typing import List, Dict, Union, Optional, Tuple, Any, cast diff --git a/odoo2data_api_mockup.py b/odoo2data_api_mockup.py index 99733ab..287d623 100755 --- a/odoo2data_api_mockup.py +++ b/odoo2data_api_mockup.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" from typing import Dict, List, Optional, Generator, cast from odoo2data_api import Cookies, UserID, ProjID, ProjREF, TaskID, TaskREF, EntryID, OdooException diff --git a/odoo2data_xmlrpc.py b/odoo2data_xmlrpc.py index e9c43d0..2325e41 100755 --- a/odoo2data_xmlrpc.py +++ b/odoo2data_xmlrpc.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" from xmlrpc import client as odoo from dotnetrc import set_password_filename, get_username_password, str_get_username_password diff --git a/odootopic.py b/odootopic.py index 979016f..ca8e929 100755 --- a/odootopic.py +++ b/odootopic.py @@ -2,7 +2,7 @@ """ associates topics with Odoo project+task coordinates """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.8.3283" +__version__ = "0.8.3312" from typing import List, Dict, Union, Optional, Tuple, Iterator, Iterable, cast diff --git a/odootopic.tests.py b/odootopic.tests.py index 5f37ab0..4256bbb 100755 --- a/odootopic.tests.py +++ b/odootopic.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.8.3283" +__version__ = "0.8.3312" import odootopic as topics from typing import Optional, Tuple, cast diff --git a/setup.cfg b/setup.cfg index 25bedfc..79b02cc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ [metadata] name = timetrack-odoo -version = 1.0.3283 +version = 1.1.3312 license = APL license_files = LICENSE diff --git a/setup.tabxlsx.cfg b/setup.tabxlsx.cfg index 1c0b9e6..a0689ea 100644 --- a/setup.tabxlsx.cfg +++ b/setup.tabxlsx.cfg @@ -2,7 +2,7 @@ [metadata] name = tabxlsx -version = 1.0.3283 +version = 1.1.3312 license = APL license_files = tabxlsx.txt @@ -19,6 +19,9 @@ include_package_data=True scripts = tabxlsx.py +[options.extras_require] +tabxlsx = tabxlsx + [options.data_files] data = tabxlsx.txt diff --git a/tabtofmt.tests.py b/tabtofmt.tests.py index 7f23602..2fb2c78 100644 --- a/tabtofmt.tests.py +++ b/tabtofmt.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.6.3283" +__version__ = "1.6.3312" from typing import Optional, Union, Dict, List, Any, Sequence, Callable from tabtotext import JSONList, JSONItem, DataList, DataItem diff --git a/tabtools.py b/tabtools.py index 948ca35..105a303 100755 --- a/tabtools.py +++ b/tabtools.py @@ -7,7 +7,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.5.3283" +__version__ = "1.5.3312" from typing import Union, List import re diff --git a/tabtools.tests.py b/tabtools.tests.py index 233cbe8..08ed699 100755 --- a/tabtools.tests.py +++ b/tabtools.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" from tabtools import * import sys diff --git a/tabtotext.py b/tabtotext.py index 17f0ff8..7028c52 100755 --- a/tabtotext.py +++ b/tabtotext.py @@ -12,7 +12,7 @@ """ __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.6.3283" +__version__ = "1.6.3312" from typing import Optional, Union, Dict, List, Any, Sequence, Callable, Type, cast, Tuple, Iterable, Iterator, TextIO, NamedTuple from collections import OrderedDict diff --git a/tabtotext.setup.md b/tabtotext.setup.md index 31b054d..7836337 100644 --- a/tabtotext.setup.md +++ b/tabtotext.setup.md @@ -59,3 +59,12 @@ number by Mibi down and then using strHours with "." full encoding. Using some "{:H}" however converts to clock values like "2:15" and using "{:$}" will convert to the default currency like "2.25€". +## tabxlsx and tabtotext() + +In the newer implementions there is no "formats" argument anymore but an +addition "selects" to help with print_tabtotext. And there is Excel support +available in tabxlsx.py that does not require openpyxl. This file is +installed as a seperate module "pip install tabxlsx" however (or +via 'make insxlsx' from development). + +At a later time, this will be the basis of a seperate tabtotext project. diff --git a/tabtotext.tests.py b/tabtotext.tests.py index 664232c..024b213 100644 --- a/tabtotext.tests.py +++ b/tabtotext.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.6.3283" +__version__ = "1.6.3312" from typing import Optional, Union, Dict, List, Any, Sequence, Callable, Iterable from tabtotext import JSONList, JSONDict, JSONItem, DataList, DataItem diff --git a/tabtoxlsx.py b/tabtoxlsx.py index a2aad07..f984b44 100755 --- a/tabtoxlsx.py +++ b/tabtoxlsx.py @@ -7,7 +7,7 @@ """ __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.6.3283" +__version__ = "1.6.3312" import logging from typing import Union, Dict, List, Any, Sequence, Iterable diff --git a/tabxlsx.tests.py b/tabxlsx.tests.py index 98514a4..23a570d 100644 --- a/tabxlsx.tests.py +++ b/tabxlsx.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.6.3283" +__version__ = "1.6.3312" from typing import Optional, Union, Dict, List, Any, Sequence, Callable, Iterable, cast import unittest diff --git a/timerange.py b/timerange.py index 7090d6a..e224df5 100755 --- a/timerange.py +++ b/timerange.py @@ -5,7 +5,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.8.3283" +__version__ = "0.8.3312" from typing import Union, Optional, Tuple diff --git a/timerange.tests.py b/timerange.tests.py index 0982ca5..e76c8b7 100755 --- a/timerange.tests.py +++ b/timerange.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.8.3283" +__version__ = "0.8.3312" import timerange as zeit from typing import Optional, cast diff --git a/timetrack.py b/timetrack.py index a5eebf8..a53e12c 100755 --- a/timetrack.py +++ b/timetrack.py @@ -2,7 +2,7 @@ """ frontend to run other modules in the system """ __copyright__ = "(C) 2019-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.2.3283" +__version__ = "0.2.3312" from typing import Optional, Union, Dict, List, Tuple, Iterable, cast diff --git a/timetrack.tests.py b/timetrack.tests.py index c2a556c..19e9c3b 100755 --- a/timetrack.tests.py +++ b/timetrack.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2019-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.2.3283" +__version__ = "0.2.3312" import timetrack as track from typing import Optional diff --git a/zeit2jira.py b/zeit2jira.py index fd76880..d6a19f7 100755 --- a/zeit2jira.py +++ b/zeit2jira.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" from typing import Optional, Union, Dict, List, Tuple, Iterable, Iterator, cast diff --git a/zeit2jira.tests.py b/zeit2jira.tests.py index 55ab186..2552a90 100755 --- a/zeit2jira.tests.py +++ b/zeit2jira.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2022-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.4.3283" +__version__ = "0.4.3312" import tabtotext import jira2data_api_mockup as jira_api_mockup diff --git a/zeit2json.py b/zeit2json.py index 573749f..b53f7c3 100755 --- a/zeit2json.py +++ b/zeit2json.py @@ -10,7 +10,7 @@ """ __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.6.3283" +__version__ = "0.6.3312" from typing import List, Dict, Union, Optional, Sequence, TextIO, Iterator, cast diff --git a/zeit2json.tests.py b/zeit2json.tests.py index fe8b81c..8871e0f 100755 --- a/zeit2json.tests.py +++ b/zeit2json.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2017-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "0.6.3283" +__version__ = "0.6.3312" import zeit2json as zeit from typing import Optional diff --git a/zeit2odoo.py b/zeit2odoo.py index dd97bd3..529a732 100755 --- a/zeit2odoo.py +++ b/zeit2odoo.py @@ -4,7 +4,7 @@ """ __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" from typing import Optional, Union, Dict, List, Tuple, cast diff --git a/zeit2odoo.tests.py b/zeit2odoo.tests.py index 3738eac..8507b02 100755 --- a/zeit2odoo.tests.py +++ b/zeit2odoo.tests.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 __copyright__ = "(C) 2021-2024 Guido Draheim, licensed under the Apache License 2.0""" -__version__ = "1.0.3283" +__version__ = "1.0.3312" import tabtotext import odoo2data_api_mockup as odoo_api_mockup