Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
silvia.terragni committed Aug 15, 2023
2 parents 9e699bb + 02fff36 commit 4c0698f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
History
=======

1.13.0 (not yet released)
1.13.0
--------------
* FIX #96 Fix preprocessing with num_processes not None
* FIX #104 fix numpy version
Expand Down
2 changes: 1 addition & 1 deletion octis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

__author__ = """Silvia Terragni"""
__email__ = 's.terragni4@campus.unimib.it'
__version__ = '1.12.1'
__version__ = '1.13.0'
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 = 1.12.1
current_version = 1.13.0
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
test_suite='tests',
tests_require=test_requirements,
url='https://github.com/MIND-LAB/OCTIS',
version='1.12.1',
version='1.13.0',
zip_safe=False,
)

0 comments on commit 4c0698f

Please sign in to comment.