Skip to content

Commit

Permalink
Merge pull request #417 from seperman/dev
Browse files Browse the repository at this point in the history
6.4.1
  • Loading branch information
seperman authored Sep 1, 2023
2 parents 0126007 + f35e05a commit 435e06e
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -17,13 +17,13 @@

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?

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)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion deepdiff/__init__.py
Original file line number Diff line number Diff line change
@@ -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__':
Expand Down
2 changes: 1 addition & 1 deletion deepdiff/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Changelog

DeepDiff Changelog

- v6-4-1

- Bugfix: Keep Numpy Optional

- v6-4-0

- `Add Ignore List Order Option to
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
contain the root `toctree` directive.
DeepDiff 6.4.0 documentation!
DeepDiff 6.4.1 documentation!
=============================

*******
Expand Down
10 changes: 5 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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.24.4
pytest==7.4.0
pytest-cov==4.1.0
python-dotenv==0.21.0
watchdog==2.2.0
Sphinx==5.3.0
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 6.4.0
current_version = 6.4.1
commit = True
tag = True
tag_name = {new_version}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 435e06e

Please sign in to comment.