Skip to content

Commit

Permalink
Merge branch 'release/1.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
cnheider committed Nov 10, 2023
2 parents b7e8a1f + 1d71a60 commit aff47e7
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
fail_fast: true
#exclude: '^exclude'
repos:
- repo: https://github.com/ambv/black
rev: 23.3.0
- repo: https://github.com/psf/black
rev: 23.10.1
hooks:
- id: black
language_version: python3.10
Expand Down
2 changes: 1 addition & 1 deletion draugr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

__project__ = "Draugr"
__author__ = "Christian Heider Lindbjerg"
__version__ = "1.1.4"
__version__ = "1.1.5"
__doc__ = r"""
Created on 27/04/2019
Expand Down
1 change: 1 addition & 0 deletions draugr/numpy_utilities/hashing.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def positive_int_hash(
) -> int:
"""
:param hasher:
:param s:
:param limit_size:
:return:
Expand Down
9 changes: 5 additions & 4 deletions draugr/visualisation/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
# del Path

try:
from .matplotlib_utilities import *
from .pillow_utilities import *
from .seaborn_utilities import *
from .progress import *
# from .matplotlib_utilities import *
# from .pillow_utilities import *
# from .seaborn_utilities import *
# from .progress import *
...
except ImportError as ix:
this_package_name = Path(__file__).parent.name
this_package_reqs = (
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apppath
warg>=1.2.9
apppath>=1.0.5
warg>=1.3.2
numpy #>=1.20.2
psutil
six
Expand Down
5 changes: 3 additions & 2 deletions requirements/requirements_visualisation.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
matplotlib>=3.8.0
matplotlib>=3.8.1
pandas>=2.1.1
scikit-learn>=1.3.1
numpy>=1.26.0
seaborn>=0.13.0
progress # remove this shit
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
pillow>=10.0.1 # not directly required, pinned by Snyk to avoid a vulnerability
pillow>=10.0.1 # not directly required, pinned by Snyk to avoid a vulnerability
scipy>=1.11.3

0 comments on commit aff47e7

Please sign in to comment.