Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-DataProperty for openSUSE:Factory checked in at 2021-05-10 15:38:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-DataProperty (Old) and /work/SRC/openSUSE:Factory/.python-DataProperty.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-DataProperty" Mon May 10 15:38:12 2021 rev:7 rq:890253 version:0.50.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-DataProperty/python-DataProperty.changes 2020-07-08 19:20:46.248551247 +0200 +++ /work/SRC/openSUSE:Factory/.python-DataProperty.new.2988/python-DataProperty.changes 2021-05-10 15:40:37.245265195 +0200 @@ -1,0 +2,8 @@ +Mon May 3 15:17:04 UTC 2021 - Martin Hauke <mar...@gmx.de> + +- Update to 0.50.1 + * Change max_workers initial value to one to avoid problems + caused by multiprocess. + * Modify type annotations. + +------------------------------------------------------------------- Old: ---- DataProperty-0.49.1.tar.gz New: ---- DataProperty-0.50.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-DataProperty.spec ++++++ --- /var/tmp/diff_new_pack.rD25UF/_old 2021-05-10 15:40:37.645263620 +0200 +++ /var/tmp/diff_new_pack.rD25UF/_new 2021-05-10 15:40:37.649263604 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-DataProperty # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-DataProperty -Version: 0.49.1 +Version: 0.50.1 Release: 0 Summary: Python library for extract property from data License: MIT ++++++ DataProperty-0.49.1.tar.gz -> DataProperty-0.50.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/DataProperty.egg-info/PKG-INFO new/DataProperty-0.50.1/DataProperty.egg-info/PKG-INFO --- old/DataProperty-0.49.1/DataProperty.egg-info/PKG-INFO 2020-05-10 05:05:15.000000000 +0200 +++ new/DataProperty-0.50.1/DataProperty.egg-info/PKG-INFO 2021-03-20 17:17:03.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: DataProperty -Version: 0.49.1 +Version: 0.50.1 Summary: Python library for extract property from data. Home-page: https://github.com/thombashi/DataProperty Author: Tsuyoshi Hombashi @@ -24,6 +24,10 @@ :target: https://badge.fury.io/py/DataProperty :alt: PyPI package version + .. image:: https://anaconda.org/conda-forge/DataProperty/badges/version.svg + :target: https://anaconda.org/conda-forge/DataProperty + :alt: conda-forge package version + .. image:: https://img.shields.io/pypi/pyversions/DataProperty.svg :target: https://pypi.org/project/DataProperty :alt: Supported Python versions @@ -45,6 +49,30 @@ :alt: Test coverage + Installation + ============ + + Installation: pip + ------------------------------ + :: + + pip install DataProperty + + Installation: conda + ------------------------------ + :: + + conda install -c conda-forge dataproperty + + Installation: apt + ------------------------------ + :: + + sudo add-apt-repository ppa:thombashi/ppa + sudo apt update + sudo apt install python3-dataproperty + + Usage ===== @@ -209,41 +237,16 @@ Full example source code can be found at *examples/py/to_column_dp_list.py* - Installation - ============ - - Install from PyPI - ------------------------------ - :: - - pip install DataProperty - - Install from PPA (for Ubuntu) - ------------------------------ - :: - - sudo add-apt-repository ppa:thombashi/ppa - sudo apt update - sudo apt install python3-dataproperty - - Dependencies ============ - Python 3.5+ - - - `mbstrdecoder <https://github.com/thombashi/mbstrdecoder>`__ - - `typepy <https://github.com/thombashi/typepy>`__ + - Python 3.5+ + - `Python package dependencies (automatically installed) <https://github.com/thombashi/DataProperty/network/dependencies>`__ Optional dependencies --------------------- - `loguru <https://github.com/Delgan/loguru>`__ - Used for logging if the package installed - Test dependencies - ----------------- - - `pytest <https://pypi.org/project/pytest>`__ - - `tox <https://pypi.org/project/tox>`__ - Keywords: data,property Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/DataProperty.egg-info/SOURCES.txt new/DataProperty-0.50.1/DataProperty.egg-info/SOURCES.txt --- old/DataProperty-0.49.1/DataProperty.egg-info/SOURCES.txt 2020-05-10 05:05:15.000000000 +0200 +++ new/DataProperty-0.50.1/DataProperty.egg-info/SOURCES.txt 2021-03-20 17:17:03.000000000 +0100 @@ -2,7 +2,6 @@ MANIFEST.in README.rst pyproject.toml -setup.cfg setup.py tox.ini DataProperty.egg-info/PKG-INFO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/DataProperty.egg-info/requires.txt new/DataProperty-0.50.1/DataProperty.egg-info/requires.txt --- old/DataProperty-0.49.1/DataProperty.egg-info/requires.txt 2020-05-10 05:05:15.000000000 +0200 +++ new/DataProperty-0.50.1/DataProperty.egg-info/requires.txt 2021-03-20 17:17:03.000000000 +0100 @@ -1,11 +1,10 @@ -setuptools>=38.3.0 mbstrdecoder<2,>=1.0.0 -typepy[datetime]<2,>=1.1.1 +typepy[datetime]<2,>=1.1.4 [logging] loguru<1,>=0.4.1 [test] -pytest -pytest-md-report +pytest>=6.0.1 +pytest-md-report>=0.1 termcolor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/PKG-INFO new/DataProperty-0.50.1/PKG-INFO --- old/DataProperty-0.49.1/PKG-INFO 2020-05-10 05:05:16.000000000 +0200 +++ new/DataProperty-0.50.1/PKG-INFO 2021-03-20 17:17:03.823692300 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: DataProperty -Version: 0.49.1 +Version: 0.50.1 Summary: Python library for extract property from data. Home-page: https://github.com/thombashi/DataProperty Author: Tsuyoshi Hombashi @@ -24,6 +24,10 @@ :target: https://badge.fury.io/py/DataProperty :alt: PyPI package version + .. image:: https://anaconda.org/conda-forge/DataProperty/badges/version.svg + :target: https://anaconda.org/conda-forge/DataProperty + :alt: conda-forge package version + .. image:: https://img.shields.io/pypi/pyversions/DataProperty.svg :target: https://pypi.org/project/DataProperty :alt: Supported Python versions @@ -45,6 +49,30 @@ :alt: Test coverage + Installation + ============ + + Installation: pip + ------------------------------ + :: + + pip install DataProperty + + Installation: conda + ------------------------------ + :: + + conda install -c conda-forge dataproperty + + Installation: apt + ------------------------------ + :: + + sudo add-apt-repository ppa:thombashi/ppa + sudo apt update + sudo apt install python3-dataproperty + + Usage ===== @@ -209,41 +237,16 @@ Full example source code can be found at *examples/py/to_column_dp_list.py* - Installation - ============ - - Install from PyPI - ------------------------------ - :: - - pip install DataProperty - - Install from PPA (for Ubuntu) - ------------------------------ - :: - - sudo add-apt-repository ppa:thombashi/ppa - sudo apt update - sudo apt install python3-dataproperty - - Dependencies ============ - Python 3.5+ - - - `mbstrdecoder <https://github.com/thombashi/mbstrdecoder>`__ - - `typepy <https://github.com/thombashi/typepy>`__ + - Python 3.5+ + - `Python package dependencies (automatically installed) <https://github.com/thombashi/DataProperty/network/dependencies>`__ Optional dependencies --------------------- - `loguru <https://github.com/Delgan/loguru>`__ - Used for logging if the package installed - Test dependencies - ----------------- - - `pytest <https://pypi.org/project/pytest>`__ - - `tox <https://pypi.org/project/tox>`__ - Keywords: data,property Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/README.rst new/DataProperty-0.50.1/README.rst --- old/DataProperty-0.49.1/README.rst 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/README.rst 2021-03-20 17:16:48.000000000 +0100 @@ -12,6 +12,10 @@ :target: https://badge.fury.io/py/DataProperty :alt: PyPI package version +.. image:: https://anaconda.org/conda-forge/DataProperty/badges/version.svg + :target: https://anaconda.org/conda-forge/DataProperty + :alt: conda-forge package version + .. image:: https://img.shields.io/pypi/pyversions/DataProperty.svg :target: https://pypi.org/project/DataProperty :alt: Supported Python versions @@ -33,6 +37,30 @@ :alt: Test coverage +Installation +============ + +Installation: pip +------------------------------ +:: + + pip install DataProperty + +Installation: conda +------------------------------ +:: + + conda install -c conda-forge dataproperty + +Installation: apt +------------------------------ +:: + + sudo add-apt-repository ppa:thombashi/ppa + sudo apt update + sudo apt install python3-dataproperty + + Usage ===== @@ -197,37 +225,12 @@ Full example source code can be found at *examples/py/to_column_dp_list.py* -Installation -============ - -Install from PyPI ------------------------------- -:: - - pip install DataProperty - -Install from PPA (for Ubuntu) ------------------------------- -:: - - sudo add-apt-repository ppa:thombashi/ppa - sudo apt update - sudo apt install python3-dataproperty - - Dependencies ============ -Python 3.5+ - -- `mbstrdecoder <https://github.com/thombashi/mbstrdecoder>`__ -- `typepy <https://github.com/thombashi/typepy>`__ +- Python 3.5+ +- `Python package dependencies (automatically installed) <https://github.com/thombashi/DataProperty/network/dependencies>`__ Optional dependencies --------------------- - `loguru <https://github.com/Delgan/loguru>`__ - Used for logging if the package installed - -Test dependencies ------------------ -- `pytest <https://pypi.org/project/pytest>`__ -- `tox <https://pypi.org/project/tox>`__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/__version__.py new/DataProperty-0.50.1/dataproperty/__version__.py --- old/DataProperty-0.49.1/dataproperty/__version__.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/__version__.py 2021-03-20 17:16:48.000000000 +0100 @@ -1,6 +1,6 @@ __author__ = "Tsuyoshi Hombashi" __copyright__ = "Copyright 2016, {}".format(__author__) __license__ = "MIT License" -__version__ = "0.49.1" +__version__ = "0.50.1" __maintainer__ = __author__ __email__ = "tsuyoshi.homba...@gmail.com" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/_common.py new/DataProperty-0.50.1/dataproperty/_common.py --- old/DataProperty-0.49.1/dataproperty/_common.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/_common.py 2021-03-20 17:16:48.000000000 +0100 @@ -61,6 +61,8 @@ Typecode.NAN: NAN_VALUE, } # type: Mapping[Typecode, Union[float, Decimal, None]] + MAX_WORKERS = 1 + def default_datetime_formatter(value): return value.strftime(DefaultValue.DATETIME_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/_dataproperty.py new/DataProperty-0.50.1/dataproperty/_dataproperty.py --- old/DataProperty-0.49.1/dataproperty/_dataproperty.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/_dataproperty.py 2021-03-20 17:16:48.000000000 +0100 @@ -168,7 +168,7 @@ :rtype: int """ - if not self._decimal_places: + if self._decimal_places is None: self.__set_digit() return self._decimal_places @@ -200,14 +200,14 @@ :rtype: int """ - if not self.__length: + if self.__length is None: self.__length = self.__get_length() return self.__length @property def ascii_char_width(self) -> int: - if not self.__ascii_char_width: + if self.__ascii_char_width is None: self.__ascii_char_width = self.__calc_ascii_char_width() return self.__ascii_char_width @@ -222,14 +222,14 @@ :rtype: int """ - if not self.__integer_digits: + if self.__integer_digits is None: self.__set_digit() return self.__integer_digits @property def additional_format_len(self) -> int: - if not self.__additional_format_len: + if self.__additional_format_len is None: self.__additional_format_len = self.__get_additional_format_len() return self.__additional_format_len @@ -268,6 +268,9 @@ return format_len def __get_base_float_len(self): + assert self.integer_digits is not None + assert self.decimal_places is not None + if any([self.integer_digits < 0, self.decimal_places < 0]): raise ValueError("integer digits and decimal places must be greater or equals to zero") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/_extractor.py new/DataProperty-0.50.1/dataproperty/_extractor.py --- old/DataProperty-0.49.1/dataproperty/_extractor.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/_extractor.py 2021-03-20 17:16:48.000000000 +0100 @@ -4,15 +4,15 @@ import copy import enum -import multiprocessing import sys -import typing +import typing # noqa from collections import Counter from datetime import datetime from decimal import Decimal from typing import Mapping # noqa -from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Type, Union, cast +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Type, Union, cast +import typepy from typepy import ( Bool, DateTime, @@ -20,7 +20,6 @@ Infinity, Integer, IpAddress, - List, Nan, NoneType, NullString, @@ -86,7 +85,7 @@ """ def __init__(self) -> None: - self.max_workers = multiprocessing.cpu_count() + self.max_workers = DefaultValue.MAX_WORKERS self.__headers = [] # type: Sequence[str] self.__default_type_hint = None # type: TypeHint @@ -109,7 +108,7 @@ DefaultValue.TYPE_VALUE_MAP ) # type: Mapping[Typecode, Union[float, Decimal, None]] - self.__trans_func_list = [] # type: typing.List[TransFunc] + self.__trans_func_list = [] # type: List[TransFunc] self.__quoting_flags = copy.deepcopy(DefaultValue.QUOTING_FLAGS) self.__datetime_formatter = None # type: Optional[Callable[[datetime], str]] self.__matrix_formatting = MatrixFormatting.TRIM @@ -166,7 +165,7 @@ Infinity, Integer, IpAddress, - List, + typepy.List, Nan, NoneType, RealNumber, @@ -245,6 +244,14 @@ return self.__float_type = value + """ + self.__type_value_map = { + Typecode.NONE: None, + Typecode.INFINITY: self.__float_type("inf"), + Typecode.NAN: self.__float_type("nan"), + } + """ + self.__clear_cache() @property @@ -355,14 +362,14 @@ self.__max_workers = value if not self.__max_workers: - self.__max_workers = multiprocessing.cpu_count() + self.__max_workers = DefaultValue.MAX_WORKERS def to_dp(self, value) -> DataProperty: self.__update_dp_converter() return self.__to_dp(value) - def to_dp_list(self, values: Sequence) -> typing.List[DataProperty]: + def to_dp_list(self, values: Sequence) -> List[DataProperty]: if is_empty_sequence(values): return [] @@ -374,7 +381,7 @@ self, value_dp_matrix: Any, previous_column_dp_list: Optional[Sequence[ColumnDataProperty]] = None, - ) -> typing.List[ColumnDataProperty]: + ) -> List[ColumnDataProperty]: col_dp_list = self.__get_col_dp_list_base() logger.debug("converting to column dataproperty:") @@ -441,7 +448,7 @@ return col_dp_list - def to_dp_matrix(self, value_matrix: Sequence) -> Sequence: + def to_dp_matrix(self, value_matrix: Sequence) -> Sequence[Sequence[DataProperty]]: self.__update_dp_converter() logger.debug( "max_workers={}, preprocessor={}".format(self.max_workers, self.__preprocessor) @@ -458,7 +465,7 @@ return self.__to_dp_matrix_mt(value_matrix) - def to_header_dp_list(self) -> typing.List[DataProperty]: + def to_header_dp_list(self) -> List[DataProperty]: self.__update_dp_converter() preprocessor = copy.deepcopy(self.__preprocessor) @@ -488,6 +495,24 @@ return True + """ + def update_dict(self, lhs: Mapping, rhs: Mapping) -> bool: + is_updated = False + + for key, value in rhs.items(): + if key not in lhs: + lhs[] + continue + + if getattr(lhs, key) == value: + continue + + setattr(lhs, key, value) + is_updated = True + + return is_updated + """ + @staticmethod def __is_dp_matrix(value) -> bool: if not value: @@ -582,7 +607,7 @@ return self.__dp_converter.convert(value_dp) - def __to_dp_matrix_st(self, value_matrix): + def __to_dp_matrix_st(self, value_matrix) -> Sequence[Sequence[DataProperty]]: return list( zip( *[ @@ -598,7 +623,7 @@ ) ) - def __to_dp_matrix_mt(self, value_matrix): + def __to_dp_matrix_mt(self, value_matrix) -> Sequence[Sequence[DataProperty]]: from concurrent import futures col_data_map = {} @@ -628,7 +653,7 @@ type_hint: TypeHint = None, preprocessor: Optional[Preprocessor] = None, strict_level_map: Optional[Dict[Typecode, int]] = None, - ) -> typing.List[DataProperty]: + ) -> List[DataProperty]: if is_empty_sequence(data_list): return [] @@ -642,7 +667,7 @@ expect_type_hint, _count = type_counter.most_common(1)[0] if not expect_type_hint( data, float_type=self.float_type, strict_level=StrictLevel.MAX - ).is_type(): # type: ignore + ).is_type(): expect_type_hint = None except IndexError: pass @@ -679,7 +704,9 @@ if self.matrix_formatting == MatrixFormatting.EXCEPTION: if min_col_size != max_col_size: raise ValueError( - "nonuniform column size: min={}, max={}".format(min_col_size, max_col_size) + "nonuniform column size found: min={}, max={}".format( + min_col_size, max_col_size + ) ) return data_matrix @@ -744,7 +771,7 @@ data_list: Sequence, type_hint: TypeHint, preprocessor: Preprocessor, -) -> Tuple[int, typing.List[DataProperty]]: +) -> Tuple[int, List[DataProperty]]: return ( col_idx, extractor._to_dp_list(data_list, type_hint=type_hint, preprocessor=preprocessor), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/_preprocessor.py new/DataProperty-0.50.1/dataproperty/_preprocessor.py --- old/DataProperty-0.49.1/dataproperty/_preprocessor.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/_preprocessor.py 2021-03-20 17:16:48.000000000 +0100 @@ -19,7 +19,7 @@ if value is None: return LineBreakHandling.NOP - return LineBreakHandling[value.upper()] + return LineBreakHandling[value.upper()] # type: ignore class Preprocessor: @@ -28,7 +28,7 @@ return self.__line_break_handling @line_break_handling.setter - def line_break_handling(self, value): + def line_break_handling(self, value: Optional[LineBreakHandling]): self.__line_break_handling = normalize_lbh(value) def __init__( @@ -83,9 +83,7 @@ return is_updated - def __preprocess_string( - self, raw_data, - ): + def __preprocess_string(self, raw_data): data = raw_data if self.replace_tabs_with_spaces: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/dataproperty/logger/_logger.py new/DataProperty-0.50.1/dataproperty/logger/_logger.py --- old/DataProperty-0.49.1/dataproperty/logger/_logger.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/dataproperty/logger/_logger.py 2021-03-20 17:16:48.000000000 +0100 @@ -24,4 +24,5 @@ def set_log_level(log_level): # deprecated + logger.disable(MODULE_NAME) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/pyproject.toml new/DataProperty-0.50.1/pyproject.toml --- old/DataProperty-0.49.1/pyproject.toml 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/pyproject.toml 2021-03-20 17:16:48.000000000 +0100 @@ -1,3 +1,6 @@ +[build-system] +requires = ["setuptools", "wheel"] + [tool.black] line-length = 100 exclude = ''' @@ -17,7 +20,6 @@ ''' [tool.isort] -dont_skip = "*/**/__init__.py" known_third_party = [ 'pytest', 'termcolor', @@ -49,3 +51,12 @@ 'abstractclassmethod', 'warnings.warn', ] + +[tool.pytest.ini_options] +testpaths = [ + "test", +] + +md_report = true +md_report_verbose = 0 +md_report_color = "auto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/requirements/requirements.txt new/DataProperty-0.50.1/requirements/requirements.txt --- old/DataProperty-0.49.1/requirements/requirements.txt 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/requirements/requirements.txt 2021-03-20 17:16:48.000000000 +0100 @@ -1,2 +1,2 @@ mbstrdecoder>=1.0.0,<2 -typepy[datetime]>=1.1.1,<2 +typepy[datetime]>=1.1.4,<2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/requirements/test_requirements.txt new/DataProperty-0.50.1/requirements/test_requirements.txt --- old/DataProperty-0.49.1/requirements/test_requirements.txt 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/requirements/test_requirements.txt 2021-03-20 17:16:48.000000000 +0100 @@ -1,3 +1,3 @@ -pytest -pytest-md-report +pytest>=6.0.1 +pytest-md-report>=0.1 termcolor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/setup.cfg new/DataProperty-0.50.1/setup.cfg --- old/DataProperty-0.49.1/setup.cfg 2020-05-10 05:05:16.000000000 +0200 +++ new/DataProperty-0.50.1/setup.cfg 2021-03-20 17:17:03.823692300 +0100 @@ -1,7 +1,3 @@ -[tool:pytest] -md_report = True -md_report_verbose = 0 - [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/setup.py new/DataProperty-0.50.1/setup.py --- old/DataProperty-0.49.1/setup.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/setup.py 2021-03-20 17:16:48.000000000 +0100 @@ -40,8 +40,6 @@ with open(os.path.join(REQUIREMENT_DIR, "test_requirements.txt")) as f: tests_requires = [line.strip() for line in f if line.strip()] -setuptools_require = ["setuptools>=38.3.0"] - setuptools.setup( name=MODULE_NAME, version=pkg_info["__version__"], @@ -60,8 +58,7 @@ package_data={MODULE_NAME: ["py.typed"]}, project_urls={"Source": REPOSITORY_URL, "Tracker": "{:s}/issues".format(REPOSITORY_URL)}, python_requires=">=3.5", - install_requires=setuptools_require + install_requires, - setup_requires=setuptools_require, + install_requires=install_requires, extras_require={"logging": ["loguru>=0.4.1,<1"], "test": tests_requires}, classifiers=[ "Development Status :: 4 - Beta", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/test/test_dataproperty.py new/DataProperty-0.50.1/test/test_dataproperty.py --- old/DataProperty-0.49.1/test/test_dataproperty.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/test/test_dataproperty.py 2021-03-20 17:16:48.000000000 +0100 @@ -275,7 +275,8 @@ dp = DataProperty( value, preprocessor=Preprocessor( - replace_tabs_with_spaces=replace_tabs_with_spaces, tab_length=tab_length, + replace_tabs_with_spaces=replace_tabs_with_spaces, + tab_length=tab_length, ), strict_level_map=get_strict_level_map(not is_convert), ) @@ -484,11 +485,15 @@ ) @pytest.mark.parametrize( - ["value", "expected"], [[0, 0], [None, None]], + ["value", "expected"], + [[0, 0], [None, None]], ) def test_abnormal(self, value, expected): assert ( - DataProperty(value, preprocessor=Preprocessor(is_escape_formula_injection=True),).data + DataProperty( + value, + preprocessor=Preprocessor(is_escape_formula_injection=True), + ).data == expected ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/test/test_extractor.py new/DataProperty-0.50.1/test/test_extractor.py --- old/DataProperty-0.49.1/test/test_extractor.py 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/test/test_extractor.py 2021-03-20 17:16:48.000000000 +0100 @@ -403,7 +403,8 @@ assert dp.data == value, value @pytest.mark.parametrize( - ["value", "expected"], [[[0, None], [0, None]]], + ["value", "expected"], + [[[0, None], [0, None]]], ) def test_exception_escape_formula_injection(self, dp_extractor, value, expected): dp_extractor.preprocessor = Preprocessor(is_escape_formula_injection=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DataProperty-0.49.1/tox.ini new/DataProperty-0.50.1/tox.ini --- old/DataProperty-0.49.1/tox.ini 2020-05-10 05:05:02.000000000 +0200 +++ new/DataProperty-0.50.1/tox.ini 2021-03-20 17:16:48.000000000 +0100 @@ -7,7 +7,6 @@ cov fmt lint - release [testenv] deps = @@ -16,7 +15,7 @@ pytest {posargs} [testenv:build] -basepython = python3.7 +basepython = python3.8 deps = twine wheel @@ -26,6 +25,7 @@ python setup.py clean --all [testenv:clean] +skip_install = true deps = cleanpy commands = @@ -35,35 +35,33 @@ deps = .[test] coverage[toml] - pytest-cov commands = - pytest --cov {posargs:-vv} + coverage run -m pytest {posargs:-vv} + coverage report -m [testenv:fmt] -basepython = python3.7 +basepython = python3.8 +skip_install = true deps = autoflake black - isort[pyproject] + isort>=5 commands = autoflake --in-place --recursive --remove-all-unused-imports --ignore-init-module-imports . - isort --apply --recursive + isort . black setup.py examples test dataproperty [testenv:lint] -basepython = python3.7 +basepython = python3.8 +skip_install = true deps = codespell + mypy pylama - pytype + # pytype commands = python setup.py check -codespell -q2 dataproperty examples test README.rst + -mypy dataproperty -pylama - -pytype --keep-going --jobs 4 --disable import-error,pyi-error dataproperty - -[testenv:release] -deps = - releasecmd>=0.3.1,<1 -commands = - python setup.py release --sign {posargs} + #-pytype --keep-going --jobs 4 --disable import-error,pyi-error dataproperty