From 1841e78e34063ccb2f4774803bd42d9cdb6752a3 Mon Sep 17 00:00:00 2001 From: Samuel Neugber Date: Thu, 28 Mar 2024 09:51:52 +0100 Subject: [PATCH 1/3] Pass 'bridge' parameter down into relevant function when calling 'up' --- scompose/project/project.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scompose/project/project.py b/scompose/project/project.py index 420c2a4..807cb90 100644 --- a/scompose/project/project.py +++ b/scompose/project/project.py @@ -476,6 +476,7 @@ def up( names, command="up", writable_tmpfs=writable_tmpfs, + bridge=bridge, no_resolv=no_resolv, ) From 3b8fe4c73ebd057eae3d9ccc56766d9fc0d3edcf Mon Sep 17 00:00:00 2001 From: Samuel Neugber Date: Thu, 28 Mar 2024 14:27:37 +0100 Subject: [PATCH 2/3] Bump version and update changelog --- CHANGELOG.md | 1 + scompose/version.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb99159..0f99d2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are: The versions coincide with releases on pypi. ## [0.1.x](https://github.com/singularityhub/singularity-compose/tree/master) (0.1.x) + - fix 'bridge' option for 'up' command (0.1.18) - add support for instance replicas (0.1.17) - fix check command validation (0.1.16) - fix a bug triggered when using startoptions in conjunction with network=false (0.1.15) diff --git a/scompose/version.py b/scompose/version.py index 85b4d0a..28538b7 100644 --- a/scompose/version.py +++ b/scompose/version.py @@ -8,7 +8,7 @@ """ -__version__ = "0.1.17" +__version__ = "0.1.18" AUTHOR = "Vanessa Sochat" AUTHOR_EMAIL = "vsoch@users.noreply.github.com" NAME = "singularity-compose" From 386edd98b0ebb48f709bbb75490dcb7712fbcd42 Mon Sep 17 00:00:00 2001 From: Samuel Neugber Date: Thu, 28 Mar 2024 14:41:58 +0100 Subject: [PATCH 3/3] Run black --- scompose/__init__.py | 1 + scompose/project/project.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scompose/__init__.py b/scompose/__init__.py index 0ff11c9..baf92fb 100644 --- a/scompose/__init__.py +++ b/scompose/__init__.py @@ -7,4 +7,5 @@ with this file, You can obtain one at http://mozilla.org/MPL/2.0/. """ + from .version import __version__ diff --git a/scompose/project/project.py b/scompose/project/project.py index 807cb90..a16f365 100644 --- a/scompose/project/project.py +++ b/scompose/project/project.py @@ -453,7 +453,6 @@ def down(self, names=None, timeout=None): def create( self, names=None, writable_tmpfs=True, bridge="10.22.0.0/16", no_resolv=False ): - """ Call the create function, which defaults to the command instance.create() """ @@ -466,7 +465,6 @@ def up( bridge="10.22.0.0/16", no_resolv=False, ): - """ Call the up function, instance.up(). @@ -488,7 +486,6 @@ def _create( bridge="10.22.0.0/16", no_resolv=False, ): - """ Create one or more instances.