diff --git a/README.rst b/README.rst index 3a9eb295..6be55feb 100644 --- a/README.rst +++ b/README.rst @@ -29,7 +29,7 @@ **Note**: This project is currently under development. -Version 1.0.0 will be the first, fully documented beta release, targetted for mid 2022. +Version 1.0.0 will be the first, fully documented beta release, targetted for end of 2022. Use law to build complex and large-scale task workflows. It is build on top of `luigi `__ and adds abstractions for **run locations**, **storage locations** and **software environments**. @@ -39,7 +39,7 @@ Key features: - CLI with auto-completion and interactive status and dependency inspection. - Remote targets with automatic retries and local caching - - WebDAV, HTTP, Dropbox, SFTP, all WLCG protocols (srm, xrootd, rfio, dcap, gsiftp, ...) + - WebDAV, HTTP, Dropbox, SFTP, all WLCG protocols (srm, xrootd, dcap, gsiftp, webdav, ...) - Automatic submission to batch systems from within tasks - HTCondor, LSF, gLite, ARC, Slurm - Environment sandboxing, configurable on task level @@ -209,22 +209,23 @@ If this is the case, just source the law completion script (which internally ena Tests ----- -To run and test law, there are three docker images available on the `DockerHub `__, corresponding to Python versions 2.7, and 3.7 to 3.10. -They are based on CentOS 7 and ship with the dependencies listed above, including gfal2. +To run and test law, there are various docker `riga/law` images available on the `DockerHub `__, corresponding to different OS and Python versions. -.. code-block:: bash - - docker run -ti riga/law:latest +| OS | Python | Tags | +| -------- | ------ | -------------------------------------- | +| Centos 8 | 3.9 | c8-py39, c8-py3, c8, py39, py3, latest | +| Centos 8 | 3.8 | c8-py38, py38 | +| Centos 8 | 3.7 | c8-py37, py37 | +| Centos 7 | 3.10 | c7-py310, py310 | +| Centos 7 | 3.9 | c7-py39, c7-py3 | +| Centos 7 | 3.8 | c7-py38 | +| Centos 7 | 3.7 | c7-py37 | +| Centos 7 | 3.6 | c7-py36, py36 | -Tags: +.. code-block:: bash -- ``py310``: Latest Python 3.10 -- ``py39``, ``py3``, ``latest``: Latest Python 3.9 -- ``py38``: Latest Python 3.8 -- ``py37``: Latest Python 3.7 -- ``py2``, ``py27``: Python 2.7 -- ``example``: Example runner, based on ``latest`` (see `below <#examples>`__) + docker run -ti riga/law:latest Development diff --git a/docker/Docker_centos8_py37 b/docker/Docker_centos8_py37 index 2f7d8a08..256c5085 100644 --- a/docker/Docker_centos8_py37 +++ b/docker/Docker_centos8_py37 @@ -1,7 +1,7 @@ FROM centos:8 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c8-py37" LABEL law.image_os="centos8" diff --git a/docker/Docker_centos8_py38 b/docker/Docker_centos8_py38 index 380a9b81..f4a37bbd 100644 --- a/docker/Docker_centos8_py38 +++ b/docker/Docker_centos8_py38 @@ -1,7 +1,7 @@ FROM centos:8 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c8-py38" LABEL law.image_os="centos8" diff --git a/docker/Docker_centos8_py39 b/docker/Docker_centos8_py39 index 97f1da16..7b35ba1d 100644 --- a/docker/Docker_centos8_py39 +++ b/docker/Docker_centos8_py39 @@ -1,7 +1,7 @@ FROM centos:8 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c8-py39" LABEL law.image_os="centos8" diff --git a/docker/Dockerfile_centos7_py27 b/docker/Dockerfile_centos7_py27 index c49fbcb2..451cc9f0 100644 --- a/docker/Dockerfile_centos7_py27 +++ b/docker/Dockerfile_centos7_py27 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py27" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py310 b/docker/Dockerfile_centos7_py310 index 1b18ac8c..9c813ad8 100644 --- a/docker/Dockerfile_centos7_py310 +++ b/docker/Dockerfile_centos7_py310 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py310" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py311 b/docker/Dockerfile_centos7_py311 index e73f0cdf..3c26967a 100644 --- a/docker/Dockerfile_centos7_py311 +++ b/docker/Dockerfile_centos7_py311 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py311" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py36 b/docker/Dockerfile_centos7_py36 index 4a212eab..344b57cd 100644 --- a/docker/Dockerfile_centos7_py36 +++ b/docker/Dockerfile_centos7_py36 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py36" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py37 b/docker/Dockerfile_centos7_py37 index dc0ceaca..f5af8987 100644 --- a/docker/Dockerfile_centos7_py37 +++ b/docker/Dockerfile_centos7_py37 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py37" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py38 b/docker/Dockerfile_centos7_py38 index 1eb33818..7714fa38 100644 --- a/docker/Dockerfile_centos7_py38 +++ b/docker/Dockerfile_centos7_py38 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py38" LABEL law.image_os="centos7" diff --git a/docker/Dockerfile_centos7_py39 b/docker/Dockerfile_centos7_py39 index 053ebcdc..1f7d5e5a 100644 --- a/docker/Dockerfile_centos7_py39 +++ b/docker/Dockerfile_centos7_py39 @@ -1,7 +1,7 @@ FROM centos:7 # labels -LABEL law.version="0.1.8" +LABEL law.version="0.1.9" LABEL law.image_name="riga/law" LABEL law.image_tag="c7-py39" LABEL law.image_os="centos7" diff --git a/law/__version__.py b/law/__version__.py index ddd97004..4de36eb1 100644 --- a/law/__version__.py +++ b/law/__version__.py @@ -12,4 +12,4 @@ __contact__ = "https://github.com/riga/law" __license__ = "BSD-3-Clause" __status__ = "Development" -__version__ = "0.1.8" +__version__ = "0.1.9"