May 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: osmo_io: Improve handling and documentation of segmentation_cb

by pespin

Attention is currently required from: laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32758 ) Change subject: osmo_io: Improve handling and documentation of segmentation_cb ...................................................................... Patch Set 4: (2 comments) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/32758/comment/87a153a7_ec2362d1 PS3, Line 249: } else if (pending_len < 0) { > Then I'd have to use -pending_len down in the memcpy which I like much less. […] Ok I see the root of the confusion now I think, "pending_len" as positive is not really the pending_len, but rather "extra_len" to be stored in the next message. So probably changing the name of the variable to "extra_len" or alike should make all this code much understandable imho. What do you think? File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/32758/comment/3b32912e_94a6b8e6 PS4, Line 256: memcpy(msgb_data(msg_pending), msgb_data(msg) + len, pending_len); see, "pending_len" is not really the "pending length to be filled for next message" here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377 Gerrit-Change-Number: 32758 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 May 2023 09:47:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Improve handling and documentation of segmentation_cb

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32758 ) Change subject: osmo_io: Improve handling and documentation of segmentation_cb ...................................................................... Patch Set 4: (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/32758/comment/b0d74305_7a2f55de PS3, Line 9: int > in Done File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/32758/comment/4e9186b7_e6fc402c PS3, Line 249: } else if (pending_len < 0) { > ok, maybe the ting here is that you should declare: […] Then I'd have to use -pending_len down in the memcpy which I like much less. You have three cases which I tried to explain in the comments: * You receive exactly one complete message, simply return the whole msgb * You receive an incomplete message, save the whole msgb for later * You receive more than one message, return the first message and save the rest (pending_len) for later -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377 Gerrit-Change-Number: 32758 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 May 2023 09:17:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Improve handling and documentation of segmentation_cb

by daniel

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/32758 to look at the new patch set (#4). Change subject: osmo_io: Improve handling and documentation of segmentation_cb ...................................................................... osmo_io: Improve handling and documentation of segmentation_cb The read length is not needed in the segmentation callback, msgb already has all the necessary information, the parameter previously was just msgb_length(msg). Also handle negative return values (except -EAGAIN) of the callback as errors which cause the msg to be dropped. -EAGAIN will defer the msg. Change-Id: I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377 --- M include/osmocom/core/osmo_io.h M src/core/osmo_io.c 2 files changed, 45 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/32758/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377 Gerrit-Change-Number: 32758 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Support detecting non-blocking connect()

by daniel

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/32759 to look at the new patch set (#5). Change subject: osmo_io: Support detecting non-blocking connect() ...................................................................... osmo_io: Support detecting non-blocking connect() libosmo-netif does a non blocking connect(), which as per definition of the socket API is signalled from the OS to the user by marking the file descriptor writable. osmo_io needs to signal this somehow. Previously osmo_io would only call the write_cb if actual data has been sent. This patch changes the behaviour so that calling osmo_iofd_write_enable() will call write_cb() on a writable socket even if the write queue is empty. Change-Id: I893cbc3becd5e125f2f06b3654578aed0aacadf3 --- M src/core/osmo_io.c M src/core/osmo_io_poll.c M tests/osmo_io/osmo_io_test.ok 3 files changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/32759/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I893cbc3becd5e125f2f06b3654578aed0aacadf3 Gerrit-Change-Number: 32759 Gerrit-PatchSet: 5 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Support detecting non-blocking connect()

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32759 ) Change subject: osmo_io: Support detecting non-blocking connect() ...................................................................... Patch Set 5: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/32759/comment/4731615e_121737db PS4, Line 9: non blocking connect() which is signalled by : marking the fd writable. > "non-blocking connect(), which as per definition of the socket API is signaled from OS to user by ma […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I893cbc3becd5e125f2f06b3654578aed0aacadf3 Gerrit-Change-Number: 32759 Gerrit-PatchSet: 5 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 May 2023 09:17:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-sgsn[master]: copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/32778 ) Change subject: copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/32778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie2d864d5171e0da2e8a6c8551d151fd14f89bf05 Gerrit-Change-Number: 32778 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 May 2023 09:12:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/30075 ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) cmd2.fg and cmd2.bg have been deprecated in cmd2 2.3.0 and removed in cmd2 2.4.0. Let's work around this by a version check. Related upstream commits: (See also: https://github.com/python-cmd2/cmd2) Commit f57b08672af97f9d973148b6c30d74fe4e712d14 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Mon Oct 11 15:20:46 2021 -0400 and Commit f217861feae45a0a1abb56436e68c5dd859d64c0 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Wed Feb 16 13:34:13 2022 -0500 Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 --- M pySim-shell.py 1 file changed, 52 insertions(+), 16 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index ae783c6..51cd9c6 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -24,7 +24,18 @@ import cmd2 from packaging import version -from cmd2 import style, fg +from cmd2 import style +# cmd2 >= 2.3.0 has deprecated the bg/fg in favor of Bg/Fg :( +if version.parse(cmd2.__version__) < version.parse("2.3.0"): + from cmd2 import fg, bg + RED = fg.red + LIGHT_RED = fg.bright_red + LIGHT_GREEN = fg.bright_green +else: + from cmd2 import Fg, Bg # pylint: disable=no-name-in-module + RED = Fg.RED + LIGHT_RED = Fg.LIGHT_RED + LIGHT_GREEN = Fg.LIGHT_GREEN from cmd2 import CommandSet, with_default_category, with_argparser import argparse @@ -142,7 +153,7 @@ super().__init__(persistent_history_file='~/.pysim_shell_history', allow_cli_args=False, auto_load_commands=False, startup_script=script, **kwargs) - self.intro = style('Welcome to pySim-shell!', fg=fg.red) + self.intro = style('Welcome to pySim-shell!', fg=RED) self.default_category = 'pySim-shell built-in commands' self.card = None self.rs = None @@ -302,23 +313,23 @@ sys.stderr = self._stderr_backup def _show_failure_sign(self): - self.poutput(style(" +-------------+", fg=fg.bright_red)) - self.poutput(style(" + ## ## +", fg=fg.bright_red)) - self.poutput(style(" + ## ## +", fg=fg.bright_red)) - self.poutput(style(" + ### +", fg=fg.bright_red)) - self.poutput(style(" + ## ## +", fg=fg.bright_red)) - self.poutput(style(" + ## ## +", fg=fg.bright_red)) - self.poutput(style(" +-------------+", fg=fg.bright_red)) + self.poutput(style(" +-------------+", fg=LIGHT_RED)) + self.poutput(style(" + ## ## +", fg=LIGHT_RED)) + self.poutput(style(" + ## ## +", fg=LIGHT_RED)) + self.poutput(style(" + ### +", fg=LIGHT_RED)) + self.poutput(style(" + ## ## +", fg=LIGHT_RED)) + self.poutput(style(" + ## ## +", fg=LIGHT_RED)) + self.poutput(style(" +-------------+", fg=LIGHT_RED)) self.poutput("") def _show_success_sign(self): - self.poutput(style(" +-------------+", fg=fg.bright_green)) - self.poutput(style(" + ## +", fg=fg.bright_green)) - self.poutput(style(" + ## +", fg=fg.bright_green)) - self.poutput(style(" + # ## +", fg=fg.bright_green)) - self.poutput(style(" + ## # +", fg=fg.bright_green)) - self.poutput(style(" + ## +", fg=fg.bright_green)) - self.poutput(style(" +-------------+", fg=fg.bright_green)) + self.poutput(style(" +-------------+", fg=LIGHT_GREEN)) + self.poutput(style(" + ## +", fg=LIGHT_GREEN)) + self.poutput(style(" + ## +", fg=LIGHT_GREEN)) + self.poutput(style(" + # ## +", fg=LIGHT_GREEN)) + self.poutput(style(" + ## # +", fg=LIGHT_GREEN)) + self.poutput(style(" + ## +", fg=LIGHT_GREEN)) + self.poutput(style(" +-------------+", fg=LIGHT_GREEN)) self.poutput("") def _process_card(self, first, script_path): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 Gerrit-Change-Number: 30075 Gerrit-PatchSet: 10 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32533 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy) In version 2.0.0, the use_ipython parameter in the Cmd constructor is renamed to include_ipy. There are still plenty of older cmd2 installations around, so let's work around this using a version check. See also: https://github.com/python-cmd2/cmd2 Commit: 2397280cad072a27a51f5ec1cc64908039d14bd1 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: 2021-03-26 18:56:33 This commit is based on pySim gerrit changes: Ifce40410587c85ae932774144b9548b154ee8ad0 I19d28276e73e7024f64ed693c3b5e37c1344c687 Change-Id: Ibc0e18b002a03ed17933be4d0b4f4e86ad99c26e --- M pySim-shell.py 1 file changed, 29 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index fab5d09..ae783c6 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -135,8 +135,13 @@ CUSTOM_CATEGORY = 'pySim Commands' def __init__(self, card, rs, sl, ch, script=None): + if version.parse(cmd2.__version__) < version.parse("2.0.0"): + kwargs = {'use_ipython': True} + else: + kwargs = {'include_ipy': True} + super().__init__(persistent_history_file='~/.pysim_shell_history', allow_cli_args=False, - use_ipython=True, auto_load_commands=False, startup_script=script) + auto_load_commands=False, startup_script=script, **kwargs) self.intro = style('Welcome to pySim-shell!', fg=fg.red) self.default_category = 'pySim-shell built-in commands' self.card = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc0e18b002a03ed17933be4d0b4f4e86ad99c26e Gerrit-Change-Number: 32533 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: markb <markboldyrev(a)gmail.com> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) In cmd2 relase 2.0.0 the constructor of Settable adds a settable_object parameter, which apparantly was optional at first, but then became mandatory. Older versions must not have the settable_object parameter but versions from 2.0.0 on require it. Let's add a version check so that we stay compatible to cmd2 versions below and above 2.0.0. See also: https://github.com/python-cmd2/cmd2 Commit 486734e85988d0d0160147b0b44a37759c833e8a Author: Eric Lin <anselor(a)gmail.com> Date: 2020-08-19 20:01:50 and Commit 8f981f37eddcccc919329245b85fd44d5975a6a7 Author: Eric Lin <anselor(a)gmail.com> Date: 2021-03-16 17:25:34 This commit is based on pySim gerrit change: Ifce40410587c85ae932774144b9548b154ee8ad0 Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff --- M README.md M pySim-shell.py M requirements.txt M setup.py 4 files changed, 50 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index a698653..1246d94 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ - pyyaml >= 5.1 - termcolor - colorlog + - packaging Example for Debian: ```sh diff --git a/pySim-shell.py b/pySim-shell.py index bf97b6f..fab5d09 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -23,6 +23,7 @@ import traceback import cmd2 +from packaging import version from cmd2 import style, fg from cmd2 import CommandSet, with_default_category, with_argparser import argparse @@ -146,18 +147,26 @@ self.ch = ch self.numeric_path = False - self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', - onchange_cb=self._onchange_numeric_path)) self.conserve_write = True - self.add_settable(cmd2.Settable('conserve_write', bool, 'Read and compare before write', - onchange_cb=self._onchange_conserve_write)) self.json_pretty_print = True - self.add_settable(cmd2.Settable('json_pretty_print', - bool, 'Pretty-Print JSON output')) self.apdu_trace = False - self.add_settable(cmd2.Settable('apdu_trace', bool, 'Trace and display APDUs exchanged with card', - onchange_cb=self._onchange_apdu_trace)) + if version.parse(cmd2.__version__) < version.parse("2.0.0"): + self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', + onchange_cb=self._onchange_numeric_path)) + self.add_settable(cmd2.Settable('conserve_write', bool, 'Read and compare before write', + onchange_cb=self._onchange_conserve_write)) + self.add_settable(cmd2.Settable('json_pretty_print', bool, 'Pretty-Print JSON output')) + self.add_settable(cmd2.Settable('apdu_trace', bool, 'Trace and display APDUs exchanged with card', + onchange_cb=self._onchange_apdu_trace)) + else: + self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', self, \ + onchange_cb=self._onchange_numeric_path)) # pylint: disable=too-many-function-args + self.add_settable(cmd2.Settable('conserve_write', bool, 'Read and compare before write', self, \ + onchange_cb=self._onchange_conserve_write)) # pylint: disable=too-many-function-args + self.add_settable(cmd2.Settable('json_pretty_print', bool, 'Pretty-Print JSON output', self)) # pylint: disable=too-many-function-args + self.add_settable(cmd2.Settable('apdu_trace', bool, 'Trace and display APDUs exchanged with card', self, \ + onchange_cb=self._onchange_apdu_trace)) # pylint: disable=too-many-function-args self.equip(card, rs) def equip(self, card, rs): diff --git a/requirements.txt b/requirements.txt index 4144a1c..bfdbd62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,3 +10,4 @@ termcolor colorlog pycryptodome +packaging diff --git a/setup.py b/setup.py index 210d307..132dfe2 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ "termcolor", "colorlog", "pycryptodome" + "packaging" ], scripts=[ 'pySim-prog.py', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 17 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: requirements.txt: allow cmd2 versions greater than 1.5

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32632 ) Change subject: requirements.txt: allow cmd2 versions greater than 1.5 ...................................................................... requirements.txt: allow cmd2 versions greater than 1.5 Since we now have fixed the compatibility issues with recent cmd2 versions, we may allow also versions greater than 1.5 in the requirements.txt Change-Id: I87702c5250a3660c84458939167bffdca9c06059 --- M README.md M requirements.txt M setup.py 3 files changed, 16 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 1246d94..da8dffc 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ - pyscard - pyserial - pytlv - - cmd2 >= 1.3.0 but < 2.0.0 + - cmd2 >= 1.5.0 - jsonpath-ng - construct >= 2.9.51 - bidict diff --git a/requirements.txt b/requirements.txt index bfdbd62..fb94472 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyscard pyserial pytlv -cmd2==1.5 +cmd2>=1.5 jsonpath-ng construct>=2.9.51 bidict diff --git a/setup.py b/setup.py index 132dfe2..17edad9 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ "pyscard", "serial", "pytlv", - "cmd2 >= 1.3.0, < 2.0.0", + "cmd2 >= 1.5.0", "jsonpath-ng", "construct >= 2.9.51", "bidict", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I87702c5250a3660c84458939167bffdca9c06059 Gerrit-Change-Number: 32632 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023