Merge pull request #431 from indigo-dc/devel3

bump version

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## udocker (1.3.17) - 2024-08-28
+
+* Update docker tools url location
+
 ## udocker (1.3.16) - 2024-04-09
 
 * Fix unit tests: remove called_with and called_once_with as invalid assertion

CODE_OF_CONDUCT.md

@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, caste, color, religion, or sexual
 identity and orientation.
 

README.md

@@ -24,6 +24,11 @@ udocker is a wrapper around several tools and libraries to mimic a
 subset of the docker capabilities including pulling images and running
 containers with minimal functionality.
 
+**Important notice: We have changed the udocker tools location as of udocker 1.3.17.
+This affects the configuration option `conf['tarball']` and environment variable
+`UDOCKER_TARBALL`, so if you are using udocker <= 1.3.16, make sure to:
+`export UDOCKER_TARBALL=https://download.a.incd.pt/udocker/udocker-englib-1.2.11.tar.gz`.
+
 ## Documentation
 
 The full documentation is available at:
@@ -83,7 +88,7 @@ extracted directory trees are placed by default under `$HOME/.udocker`.
 
 ## Python 2 and Python 3
 
-Since v1.3.0, udocker supports Python 2.6, 2.7 and Python >= 3.6.
+Since v1.3.0, udocker supports Python 2.7 and Python >= 3.6.
 The original udocker v1.1.x for Python 2 is no longer maintained
 but is still available
 [here](https://github.com/indigo-dc/udocker/tree/v1.1.8).

codemeta.json

@@ -6,7 +6,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "udocker",
     "name": "udocker",
-    "version": "1.3.16",
+    "version": "1.3.17",
     "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": [

docs/installation_manual.md

@@ -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.16/udocker-1.3.16.tar.gz
-tar zxvf udocker-1.3.16.tar.gz
-export PATH=`pwd`/udocker-1.3.16/udocker:$PATH
+wget https://github.com/indigo-dc/udocker/releases/download/1.3.17/udocker-1.3.17.tar.gz
+tar zxvf udocker-1.3.17.tar.gz
+export PATH=`pwd`/udocker-1.3.17/udocker:$PATH
 ```
 
 Alternatively use `curl` instead of `wget` as follows:
 
 ```bash
-curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.16/udocker-1.3.16.tar.gz \
-  > udocker-1.3.16.tar.gz
-tar zxvf udocker-1.3.16.tar.gz
-export PATH=`pwd`/udocker-1.3.16/udocker:$PATH
+curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.17/udocker-1.3.17.tar.gz \
+  > udocker-1.3.17.tar.gz
+tar zxvf udocker-1.3.17.tar.gz
+export PATH=`pwd`/udocker-1.3.17/udocker:$PATH
 ```
 
 udocker executes containers using external tools and libraries that
@@ -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.16/udocker-1.3.16.tar.gz
-tar zxvf udocker-1.3.16.tar.gz
+wget https://github.com/indigo-dc/udocker/releases/download/1.3.17/udocker-1.3.17.tar.gz
+tar zxvf udocker-1.3.17.tar.gz
 ```
 
 Directing users to the central udocker installation can be done using the

docs/udocker.1

@@ -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 "9 Apr 2024" "version 1.3.16" "udocker man page"
+.TH udocker 1 "28 Aug 2024" "version 1.3.17" "udocker man page"
 .SH NAME
 udocker \- execute Docker containers in user space without privileges
 .SH SYNOPSIS

setup.cfg

@@ -17,4 +17,4 @@ skip = .git,paper.bib
 check-hidden = true
 ignore-regex = \bFinisFinish Terrae II\b
 # some commands and unfortunate variable names
-ignore-words-list = buildd,struc,regist
+ignore-words-list = buildd,struc,regist,assertIn

tests/unit/test_tools.py

@@ -248,7 +248,7 @@ def test_11__get_mirrors(self, mock_gupycurl):
         """Test11 UdockerTools()._get_mirrors()."""
         mock_gupycurl.return_value = True
 
-        mirrors = "https://download.ncg.ingrid.pt/udocker-1.2.7.tar.gz"
+        mirrors = "https://download.a.incd.pt/udocker/udocker-englib-1.2.11.tar.gz"
         utools = UdockerTools(self.local)
         status = utools._get_mirrors(mirrors)
         self.assertEqual(status, [mirrors])

udocker/__init__.py

@@ -32,5 +32,5 @@
     "Singularity http://singularity.lbl.gov"
     ]
 __license__ = "Licensed under the Apache License, Version 2.0"
-__version__ = "1.3.16"
+__version__ = "1.3.17"
 __date__ = "2024"

udocker/config.py

@@ -31,8 +31,7 @@ class Config(object):
     # the actual tarball used in the installation can have a higher version
     conf['tarball_release'] = "1.2.11"
     conf['tarball'] = (
-        "https://download.ncg.ingrid.pt/"
-        "webdav/udocker/udocker-englib-1.2.11.tar.gz"
+        "https://download.a.incd.pt/udocker/udocker-englib-1.2.11.tar.gz"
         " "
         "https://raw.githubusercontent.com"
         "/jorge-lip/udocker-builds/master/tarballs/udocker-englib-1.2.11.tar.gz"

utils/udocker_test.sh

@@ -36,8 +36,8 @@ DEFAULT_UDIR=$HOME/.udocker-tests
 TEST_UDIR=$HOME/.udocker-test-h45y7k9X
 TAR_IMAGE="centos7.tar"
 TAR_CONT="centos7-cont.tar"
-TAR_IMAGE_URL="https://download.ncg.ingrid.pt/webdav/udocker_test/${TAR_IMAGE}"
-TAR_CONT_URL="https://download.ncg.ingrid.pt/webdav/udocker_test/${TAR_CONT}"
+TAR_IMAGE_URL="https://download.a.incd.pt/udocker_test/${TAR_IMAGE}"
+TAR_CONT_URL="https://download.a.incd.pt/udocker_test/${TAR_CONT}"
 DOCKER_IMG="ubuntu:22.04"
 CONT="ubuntu"
 export UDOCKER_DIR=${DEFAULT_UDIR}