Skip to content

Commit

Permalink
Merge pull request #145 from yarikoptic/bf-mock
Browse files Browse the repository at this point in the history
RF: mock -> unittest.mock  and kick out 1.1.2 release
  • Loading branch information
yarikoptic authored Jan 16, 2021
2 parents 65a4cf4 + aee55a6 commit 0af5037
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ This is a high level and scarce summary of the changes between releases. We
would recommend to consult log of the [DataLad git
repository](http://github.com/datalad/datalad-container) for more details.

## 1.1.2 (January 16, 2021) --

- Replace use of `mock` with `unittest.mock` as we do no longer support
Python 2

## 1.1.1 (January 03, 2021) --

- Drop use of `Runner` (to be removed in datalad 0.14.0) in favor of
Expand Down Expand Up @@ -40,7 +45,7 @@ repository](http://github.com/datalad/datalad-container) for more details.
Extension is pretty stable so releasing as 1. MAJOR release, so we could
start tracking API breakages and enhancements properly.

- Drops support for Python 2 and DatLad prior 0.12
- Drops support for Python 2 and DataLad prior 0.12

## 0.5.2 (Nov 12, 2019) --

Expand Down
2 changes: 1 addition & 1 deletion datalad_container/containers_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ContainersRun(Interface):
def __call__(cmd, container_name=None, dataset=None,
inputs=None, outputs=None, message=None, expand=None,
explicit=False, sidecar=None):
from mock import patch # delayed, since takes long (~600ms for yoh)
from unittest.mock import patch # delayed, since takes long (~600ms for yoh)
pwd, _ = get_command_pwds(dataset)
ds = require_dataset(dataset, check_installed=True,
purpose='run a containerized command execution')
Expand Down
2 changes: 1 addition & 1 deletion datalad_container/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1.1'
__version__ = '1.1.2'
8 changes: 7 additions & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ We would recommend to consult log of the `DataLad git
repository <http://github.com/datalad/datalad-container>`__ for more
details.

1.1.2 (January 16, 2021) –
--------------------------

- Replace use of ``mock`` with ``unittest.mock`` as we do no longer
support Python 2

1.1.1 (January 03, 2021) –
--------------------------

Expand Down Expand Up @@ -51,7 +57,7 @@ details.
Extension is pretty stable so releasing as 1. MAJOR release, so we could
start tracking API breakages and enhancements properly.

- Drops support for Python 2 and DatLad prior 0.12
- Drops support for Python 2 and DataLad prior 0.12

0.5.2 (Nov 12, 2019) –
----------------------
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def findsome(subdir, extensions):
'core': [
'datalad>=0.13',
'requests>=1.2', # to talk to Singularity-hub
'mock', # used in containers_run
],
'devel-docs': [
# used for converting README.md -> .rst for long_description
Expand Down

0 comments on commit 0af5037

Please sign in to comment.