Skip to content

Commit

Permalink
Merge pull request #422 from indigo-dc/devel3
Browse files Browse the repository at this point in the history
Devel3
  • Loading branch information
mariojmdavid authored Apr 9, 2024
2 parents 49dc2d8 + dd32b9b commit cb2d80b
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 17 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## udocker (1.3.15) - 2024-04-09

* Fix unit tests: remove called_with as invalid assertion introduced in python 3.12
* This version is the same as 1.3.14

## udocker (1.3.14) - 2024-04-04

* Support for runsc as engine for execution mode R1: closes #414
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@type": "SoftwareSourceCode",
"identifier": "udocker",
"name": "udocker",
"version": "1.3.14",
"version": "1.3.15",
"description": "A basic user tool to execute simple docker containers in batch or interactive systems without root privileges",
"license": "Apache Software License 2.0, OSI Approved :: Apache Software License",
"author": [
Expand Down
18 changes: 9 additions & 9 deletions docs/installation_manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ udocker requires:
Download a release tarball from <https://github.com/indigo-dc/udocker/releases>:

```bash
wget https://github.com/indigo-dc/udocker/releases/download/1.3.14/udocker-1.3.14.tar.gz
tar zxvf udocker-1.3.14.tar.gz
export PATH=`pwd`/udocker-1.3.14/udocker:$PATH
wget https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
export PATH=`pwd`/udocker-1.3.15/udocker:$PATH
```

Alternatively use `curl` instead of `wget` as follows:

```bash
curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.14/udocker-1.3.14.tar.gz \
> udocker-1.3.14.tar.gz
tar zxvf udocker-1.3.14.tar.gz
export PATH=`pwd`/udocker-1.3.14/udocker:$PATH
curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz \
> udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
export PATH=`pwd`/udocker-1.3.15/udocker:$PATH
```

udocker executes containers using external tools and libraries that
Expand Down Expand Up @@ -389,8 +389,8 @@ The udocker tool should be installed as shown in section 2.1:

```bash
cd /sw
wget https://github.com/indigo-dc/udocker/releases/download/1.3.14/udocker-1.3.14.tar.gz
tar zxvf udocker-1.3.14.tar.gz
wget https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
```

Directing users to the central udocker installation can be done using the
Expand Down
2 changes: 1 addition & 1 deletion docs/udocker.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for udocker
.\" Contact [email protected] to correct errors or typos.
.\" To read this man page use: man -l udocker.1
.TH udocker 1 "4 Apr 2024" "version 1.3.14" "udocker man page"
.TH udocker 1 "9 Apr 2024" "version 1.3.15" "udocker man page"
.SH NAME
udocker \- execute Docker containers in user space without privileges
.SH SYNOPSIS
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ def test_01_init(self, mock_dockerio, mock_ks, mock_lfapi):
UdockerCLI(self.local)
self.assertTrue(mock_dockerio.called)
self.assertTrue(mock_lfapi.called)
self.assertTrue(mock_ks.called_with(Config().conf['keystore']))

# Test Config().conf['keystore'] does not starts with /
Config().conf['keystore'] = "xx"
UdockerCLI(self.local)
self.assertTrue(mock_ks.called_with(Config().conf['keystore']))
self.assertTrue(mock_ks.called)

@patch('udocker.cli.DockerIoAPI')
@patch('udocker.cli.FileUtil.isdir')
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_curl.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_03_setvalue_from_file(self, mock_write):
lambda self: iter(fakedata.readline, ''))
curl_header = CurlHeader()
self.assertTrue(curl_header.setvalue_from_file("filename"))
self.assertTrue(mock_write.called_with('XXXX'))
self.assertTrue(mock_write.called)

def test_04_getvalue(self):
"""Test04 CurlHeader().getvalue()."""
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_curlheader.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_03_setvalue_from_file(self, mock_write):
lambda self: iter(fakedata.readline, ''))
curl_header = CurlHeader()
self.assertTrue(curl_header.setvalue_from_file("filename"))
self.assertTrue(mock_write.called_with('XXXX'))
self.assertTrue(mock_write.called)

def test_04_getvalue(self):
"""Test04 CurlHeader().getvalue()."""
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_dockerioapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_02_set_proxy(self, mock_geturl):
url = "socks5://user:pass@host:port"
doia = DockerIoAPI(self.local)
doia.set_proxy(url)
self.assertTrue(mock_geturl.return_value.set_proxy.called_with(url))
self.assertTrue(mock_geturl.return_value.set_proxy.called)

@patch('udocker.docker.GetURL')
def test_03_set_registry(self, mock_geturl):
Expand Down
2 changes: 1 addition & 1 deletion udocker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"Singularity http://singularity.lbl.gov"
]
__license__ = "Licensed under the Apache License, Version 2.0"
__version__ = "1.3.14"
__version__ = "1.3.15"
__date__ = "2024"

0 comments on commit cb2d80b

Please sign in to comment.