osmith has submitted this change. ( 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(-)

Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified

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