Attention is currently required from: osmith.
fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/pysim/+/40952?usp=email )
Change subject: requirements: set cmd2>=2.6.2,<3.0
......................................................................
Patch Set 1:
(1 comment)
File requirements.txt:
https://gerrit.osmocom.org/c/pysim/+/40952/comment/73e6eea7_647aa32d?usp=em… :
PS1, Line 4: cmd2>=2.6.2,<3.0
I am not sure if it's a good idea to set `<3.0` here. This is only relevant for building documentation, running with cmd2 should still be possible, right?
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/40952?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4ba65ed486247c5670313b75f43a242d264df14b
Gerrit-Change-Number: 40952
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 Aug 2025 12:55:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: osmith.
fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/pysim/+/40953?usp=email )
Change subject: docs: fix authors line exceeding the page
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/40953?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8
Gerrit-Change-Number: 40953
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 Aug 2025 12:49:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40953?usp=email )
Change subject: docs: fix authors line exceeding the page
......................................................................
docs: fix authors line exceeding the page
Fix that the authors get cut off as they exceed the page in the PDF
version. This can currently be seen here:
https://downloads.osmocom.org/docs/pysim/master/osmopysim-usermanual.pdf
Change-Id: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8
---
M docs/conf.py
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/40953/1
diff --git a/docs/conf.py b/docs/conf.py
index 8455007..9091878 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,6 +21,14 @@
copyright = '2009-2023 by Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle, Merlin Chlosta'
author = 'Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle, Merlin Chlosta'
+# PDF: Avoid that the authors list exceeds the page by inserting '\and'
+# manually as line break (https://github.com/sphinx-doc/sphinx/issues/6875)
+latex_elements = {
+ "maketitle":
+ r"""\author{Sylvain Munaut, Harald Welte, Philipp Maier, \and Supreeth Herle, Merlin Chlosta}
+\sphinxmaketitle
+"""
+}
# -- General configuration ---------------------------------------------------
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/40953?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8
Gerrit-Change-Number: 40953
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40952?usp=email )
Change subject: requirements: set cmd2>=2.6.2,<3.0
......................................................................
requirements: set cmd2>=2.6.2,<3.0
Remove the previous workaround that set cmd2==2.4.3 in jenkins.sh. The
bug this worked around has been fixed in 2.6.2.
3.0 will break unless we use some new additional decorator.
Related: OS#6776
Change-Id: I4ba65ed486247c5670313b75f43a242d264df14b
---
M contrib/jenkins.sh
M requirements.txt
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/40952/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 63087f0..de1d9f8 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -82,10 +82,6 @@
pip install -r requirements.txt
- # XXX: workaround for https://github.com/python-cmd2/cmd2/issues/1414
- # 2.4.3 was the last stable release not affected by this bug (OS#6776)
- pip install cmd2==2.4.3
-
rm -rf docs/_build
make -C "docs" html latexpdf
diff --git a/requirements.txt b/requirements.txt
index 9749d7f..056d912 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
pyscard
pyserial
pytlv
-cmd2>=1.5
+cmd2>=2.6.2,<3.0
jsonpath-ng
construct>=2.10.70
bidict
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/40952?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4ba65ed486247c5670313b75f43a242d264df14b
Gerrit-Change-Number: 40952
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email )
Change subject: testenv: enable_binary_repo: configure apt pin
......................................................................
testenv: enable_binary_repo: configure apt pin
Add an apt-pin to ensure packages from the Osmocom repositories get
preferred over Debian's packages. I just ran into this with osmo-mgw,
where we have 1.4.0 in osmocom:latest and Debian 13 has 1.14.0+dfsg1-2,
which counts as higher version. This results in the wrong package being
selected, and also in an error later on when trying to install related
debug packages from our repository:
The following packages have unmet dependencies:
osmo-mgw-dbgsym : Depends: osmo-mgw (= 1.14.0) but 1.14.0+dfsg1-2 is to be installed
Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4
---
M _testenv/testenv/podman.py
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py
index bc45b3a..678a0c1 100644
--- a/_testenv/testenv/podman.py
+++ b/_testenv/testenv/podman.py
@@ -301,16 +301,23 @@
def enable_binary_repo():
+ # Add the binary repository
config = "deb [signed-by=/obs.key]"
config += " https://downloads.osmocom.org/packages/"
config += testenv.args.binary_repo.replace(":", ":/")
config += "/"
config += testenv.distros_repodirs[distro]
config += "/ ./"
-
path = "/etc/apt/sources.list.d/osmocom.list"
-
exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"])
+
+ # Add an apt-pin to prefer its packages
+ config = "Package: *\n"
+ config += 'Pin: origin "downloads.osmocom.org"\n'
+ config += "Pin-Priority: 1100\n"
+ path = "/etc/apt/preferences.d/osmocom-apt-pin"
+ exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"])
+
exec_cmd(["apt-get", "-q", "update"])
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4
Gerrit-Change-Number: 40948
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>