From 410019e2dad5023632a668b454ede6ed42ad2a9d Mon Sep 17 00:00:00 2001 From: Seperman Date: Fri, 1 Sep 2023 09:20:05 -0700 Subject: [PATCH 1/3] Don't check for numpy version if no numpy --- CHANGELOG.md | 2 ++ README.md | 2 +- deepdiff/helper.py | 2 +- docs/changelog.rst | 4 ++++ requirements-dev.txt | 10 +++++----- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 870faa33..f8197c40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # DeepDiff Change log +- v6-4-1 + - Bugfix: Keep Numpy Optional - v6-4-0 - [Add Ignore List Order Option to DeepHash](https://github.com/seperman/deepdiff/pull/403) by [Bobby Morck](https://github.com/bmorck) diff --git a/README.md b/README.md index 6e823c54..db95b88c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Tested on Python 3.7+ and PyPy3. Please check the [ChangeLog](CHANGELOG.md) file for the detailed information. -DeepDiff 6-4-0 +DeepDiff 6-4-1 - [Add Ignore List Order Option to DeepHash](https://github.com/seperman/deepdiff/pull/403) by [Bobby Morck](https://github.com/bmorck) diff --git a/deepdiff/helper.py b/deepdiff/helper.py index ea3b5d95..cec24f38 100644 --- a/deepdiff/helper.py +++ b/deepdiff/helper.py @@ -155,7 +155,7 @@ def get_semvar_as_integer(version): pypy3 = py3 and hasattr(sys, "pypy_translation_info") -if get_semvar_as_integer(np.__version__) < 1019000: +if np and get_semvar_as_integer(np.__version__) < 1019000: sys.exit('The minimum required Numpy version is 1.19.0. Please upgrade your Numpy package.') strings = (str, bytes) # which are both basestring diff --git a/docs/changelog.rst b/docs/changelog.rst index 2126e7f1..15786882 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,10 @@ Changelog DeepDiff Changelog +- v6-4-1 + + - Bugfix: Keep Numpy Optional + - v6-4-0 - `Add Ignore List Order Option to diff --git a/requirements-dev.txt b/requirements-dev.txt index c505b052..b0f4f0ca 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,12 +1,12 @@ -r requirements.txt -r requirements-cli.txt bump2version==1.0.1 -jsonpickle==3.0.0 +jsonpickle==3.0.2 coverage==6.5.0 -ipdb==0.13.9 -numpy==1.23.5 -pytest==7.2.0 -pytest-cov==4.0.0 +ipdb==0.13.13 +numpy==1.25.2 +pytest==7.4.0 +pytest-cov==4.1.0 python-dotenv==0.21.0 watchdog==2.2.0 Sphinx==5.3.0 From 16c1bef03e3f9cd711feeec199acc71da54c137d Mon Sep 17 00:00:00 2001 From: Seperman Date: Fri, 1 Sep 2023 09:20:28 -0700 Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=206.4.0=20=E2=86=92=206.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- deepdiff/__init__.py | 2 +- docs/conf.py | 4 ++-- docs/index.rst | 2 +- setup.cfg | 2 +- setup.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index db95b88c..52998db5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DeepDiff v 6.4.0 +# DeepDiff v 6.4.1 ![Downloads](https://img.shields.io/pypi/dm/deepdiff.svg?style=flat) ![Python Versions](https://img.shields.io/pypi/pyversions/deepdiff.svg?style=flat) @@ -17,7 +17,7 @@ Tested on Python 3.7+ and PyPy3. -- **[Documentation](https://zepworks.com/deepdiff/6.4.0/)** +- **[Documentation](https://zepworks.com/deepdiff/6.4.1/)** ## What is new? @@ -82,11 +82,11 @@ Thank you! How to cite this library (APA style): - Dehpour, S. (2023). DeepDiff (Version 6.4.0) [Software]. Available from https://github.com/seperman/deepdiff. + Dehpour, S. (2023). DeepDiff (Version 6.4.1) [Software]. Available from https://github.com/seperman/deepdiff. How to cite this library (Chicago style): - Dehpour, Sep. 2023. DeepDiff (version 6.4.0). + Dehpour, Sep. 2023. DeepDiff (version 6.4.1). # Authors diff --git a/deepdiff/__init__.py b/deepdiff/__init__.py index f923a74a..1398f17f 100644 --- a/deepdiff/__init__.py +++ b/deepdiff/__init__.py @@ -1,6 +1,6 @@ """This module offers the DeepDiff, DeepSearch, grep, Delta and DeepHash classes.""" # flake8: noqa -__version__ = '6.4.0' +__version__ = '6.4.1' import logging if __name__ == '__main__': diff --git a/docs/conf.py b/docs/conf.py index 4681e077..b8f4ee49 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -61,9 +61,9 @@ # built documents. # # The short X.Y version. -version = '6.4.0' +version = '6.4.1' # The full version, including alpha/beta/rc tags. -release = '6.4.0' +release = '6.4.1' load_dotenv(override=True) DOC_VERSION = os.environ.get('DOC_VERSION', version) diff --git a/docs/index.rst b/docs/index.rst index 14be4bd4..d5b9dae9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. -DeepDiff 6.4.0 documentation! +DeepDiff 6.4.1 documentation! ============================= ******* diff --git a/setup.cfg b/setup.cfg index 25568aaa..0297900b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 6.4.0 +current_version = 6.4.1 commit = True tag = True tag_name = {new_version} diff --git a/setup.py b/setup.py index a7f8d1e1..d41765c9 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ if os.environ.get('USER', '') == 'vagrant': del os.link -version = '6.4.0' +version = '6.4.1' def get_reqs(filename): From f35e05ada73a58f45336ab2147318f839b6addd0 Mon Sep 17 00:00:00 2001 From: Seperman Date: Fri, 1 Sep 2023 09:23:04 -0700 Subject: [PATCH 3/3] Numpy 1.25.2 is not supported by Python 3.8 --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b0f4f0ca..25a40748 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ bump2version==1.0.1 jsonpickle==3.0.2 coverage==6.5.0 ipdb==0.13.13 -numpy==1.25.2 +numpy==1.24.4 pytest==7.4.0 pytest-cov==4.1.0 python-dotenv==0.21.0