From c296a29fee26da1a621e8d2b885190e620b779a4 Mon Sep 17 00:00:00 2001 From: sroopsai Date: Sun, 31 Mar 2019 16:17:52 +0530 Subject: [PATCH 1/5] small cleanup --- openrobertalab | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openrobertalab b/openrobertalab index 9b3501e..80ebb0a 100644 --- a/openrobertalab +++ b/openrobertalab @@ -2,14 +2,13 @@ import atexit import logging -from gi.repository import GObject +from gi.repository import GLib from dbus.mainloop.glib import DBusGMainLoop from roberta.lab import Service logging.basicConfig(level=logging.INFO) logger = logging.getLogger('roberta') -GObject.threads_init() service = None @@ -32,7 +31,7 @@ def main(): atexit.register(cleanup) DBusGMainLoop(set_as_default=True) - loop = GObject.MainLoop() + loop = GLib.MainLoop() service = Service('/org/openroberta/Lab1') logger.debug('loop running') loop.run() From b3b3b9a142810468c162336f0117acf36e48232a Mon Sep 17 00:00:00 2001 From: sroopsai Date: Sun, 31 Mar 2019 17:13:04 +0530 Subject: [PATCH 2/5] changed 'is' comparison operator to '==' --- roberta/BlocklyMethods.py | 16 ++++++++-------- roberta/ev3.py | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/roberta/BlocklyMethods.py b/roberta/BlocklyMethods.py index a0889bc..d490cef 100644 --- a/roberta/BlocklyMethods.py +++ b/roberta/BlocklyMethods.py @@ -178,15 +178,15 @@ def modeOnList(_list): @staticmethod def _calculateIndex(_list, location, index): - if location is 'from_start': + if location == 'from_start': return index - elif location is 'from_end': + elif location == 'from_end': return len(_list) - 1 - index - elif location is 'first': + elif location == 'first': return 0 - elif location is 'last': + elif location == 'last': return len(_list) - 1 - elif location is 'random': + elif location == 'random': return BlocklyMethods.randInt(0, len(_list) - 1) else: logger.info('unknown location type [%s]' % location) @@ -194,12 +194,12 @@ def _calculateIndex(_list, location, index): @staticmethod def _executeOperation(_list, operation, index, element): result = _list[index] - if operation is 'set': + if operation == 'set': _list[index] = element - elif operation is 'insert': + elif operation == 'insert': _list[index:index] = [element] result = element - elif operation is 'get': + elif operation == 'get': pass elif operation in ['remove', 'get_remove']: del _list[index] diff --git a/roberta/ev3.py b/roberta/ev3.py index 2a2c506..6fff6f4 100644 --- a/roberta/ev3.py +++ b/roberta/ev3.py @@ -78,7 +78,7 @@ def __init__(self, brickConfiguration, usedSensors=None): def makeLargeMotor(port, regulated, direction, side=None): try: m = ev3dev.LargeMotor(port) - if direction is 'backward': + if direction == 'backward': m.polarity = 'inversed' else: m.polarity = 'normal' @@ -92,7 +92,7 @@ def makeLargeMotor(port, regulated, direction, side=None): def makeMediumMotor(port, regulated, direction, side=None): try: m = ev3dev.MediumMotor(port) - if direction is 'backward': + if direction == 'backward': m.polarity = 'inversed' else: m.polarity = 'normal' @@ -383,11 +383,11 @@ def rotateRegulatedMotor(self, port, speed_pct, mode, value): # mode: degree, rotations, distance m = self.cfg['actors'][port] speed = self.scaleSpeed(m, clamp(speed_pct, -100, 100)) - if mode is 'degree': + if mode == 'degree': m.run_to_rel_pos(position_sp=value, speed_sp=speed) while (m.state and 'stalled' not in m.state): self.busyWait() - elif mode is 'rotations': + elif mode == 'rotations': value *= m.count_per_rot m.run_to_rel_pos(position_sp=int(value), speed_sp=speed) while (m.state and 'stalled' not in m.state): @@ -396,7 +396,7 @@ def rotateRegulatedMotor(self, port, speed_pct, mode, value): def rotateUnregulatedMotor(self, port, speed_pct, mode, value): speed_pct = clamp(speed_pct, -100, 100) m = self.cfg['actors'][port] - if mode is 'rotations': + if mode == 'rotations': value *= m.count_per_rot if speed_pct >= 0: value = m.position + value @@ -439,9 +439,9 @@ def stopMotor(self, port, mode='float'): # mode: float, nonfloat # stop_actions: ['brake', 'coast', 'hold'] m = self.cfg['actors'][port] - if mode is 'float': + if mode == 'float': m.stop_action = 'coast' - elif mode is 'nonfloat': + elif mode == 'nonfloat': m.stop_action = 'brake' m.stop() @@ -469,7 +469,7 @@ def regulatedDrive(self, left_port, right_port, reverse, direction, speed_pct): speed_pct = clamp(speed_pct, -100, 100) ml = self.cfg['actors'][left_port] mr = self.cfg['actors'][right_port] - if direction is 'backward': + if direction == 'backward': speed_pct = -speed_pct ml.run_forever(speed_sp=self.scaleSpeed(ml, speed_pct)) mr.run_forever(speed_sp=self.scaleSpeed(mr, speed_pct)) @@ -482,7 +482,7 @@ def driveDistance(self, left_port, right_port, reverse, direction, speed_pct, di mr = self.cfg['actors'][right_port] circ = math.pi * self.cfg['wheel-diameter'] dc = distance / circ - if direction is 'backward': + if direction == 'backward': dc = -dc # set all attributes ml.stop_action = 'brake' @@ -504,7 +504,7 @@ def rotateDirectionRegulated(self, left_port, right_port, reverse, direction, sp speed_pct = clamp(speed_pct, -100, 100) ml = self.cfg['actors'][left_port] mr = self.cfg['actors'][right_port] - if direction is 'left': + if direction == 'left': mr.run_forever(speed_sp=self.scaleSpeed(mr, speed_pct)) ml.run_forever(speed_sp=self.scaleSpeed(ml, -speed_pct)) else: @@ -527,7 +527,7 @@ def rotateDirectionAngle(self, left_port, right_port, reverse, direction, speed_ ml.speed_sp = self.scaleSpeed(ml, speed_pct) mr.stop_action = 'brake' mr.speed_sp = self.scaleSpeed(mr, speed_pct) - if direction is 'left': + if direction == 'left': mr.position_sp = int(dc * mr.count_per_rot) ml.position_sp = int(-dc * ml.count_per_rot) else: @@ -559,7 +559,7 @@ def driveInCurve(self, direction, left_port, left_speed_pct, right_port, right_s ml.speed_sp = int(left_speed_pct) mr.stop_action = 'brake' mr.speed_sp = int(right_speed_pct) - if direction is 'backward': + if direction == 'backward': ml.position_sp = int(-left_dc * ml.count_per_rot) mr.position_sp = int(-right_dc * mr.count_per_rot) else: @@ -571,7 +571,7 @@ def driveInCurve(self, direction, left_port, left_speed_pct, right_port, right_s while ((ml.state and left_speed_pct) or (mr.state and right_speed_pct)): self.busyWait() else: - if direction is 'backward': + if direction == 'backward': ml.run_forever(speed_sp=int(-left_speed_pct)) mr.run_forever(speed_sp=int(-right_speed_pct)) else: From fb66801247c2dec27dc9135b1f8b03b43f882142 Mon Sep 17 00:00:00 2001 From: sroopsai Date: Mon, 1 Apr 2019 13:48:10 +0530 Subject: [PATCH 3/5] Converted README.md to long_desc --- setup.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index f0d7341..c7d908c 100755 --- a/setup.py +++ b/setup.py @@ -2,9 +2,10 @@ import codecs import os -from distutils.core import setup +from setuptools import setup +import pathlib -version = '?' +version = '1.7.4+1.0.0' root = os.path.dirname(os.path.abspath(__file__)) # Path to __version__ module version_file = os.path.join(root, 'roberta', '__version__.py') @@ -12,17 +13,25 @@ # If not create the __version__ module containing the version if not os.path.exists(os.path.join(root, 'PKG-INFO')): fd = codecs.open(version_file, 'w', 'utf-8') - fd.write('version = %r\n' % os.getenv('VERSION', '?')) + fd.write('version = %r\n' % os.getenv('VERSION', version)) fd.close() # Load version + exec(open(version_file).read()) # TODO: convert README.md to long_desc # https://gist.github.com/aubricus/9184003#file-setup_snippet-py +HERE = pathlib.Path(__file__).parent + +#The text of the README file +README = (HERE / "README.md").read_text() + setup(name='openrobertalab', version=version, description='lab.open-roberta.org connector for ev3dev.org', + long_description=README, + long_description_content_type='text/markdown', author='Stefan Sauer', author_email='ensonic@google.com', url='https://www.open-roberta.org/', From 0585b2bd7ad07510fdb909c6f468d1e63dd78601 Mon Sep 17 00:00:00 2001 From: sroopsai Date: Mon, 1 Apr 2019 23:16:29 +0530 Subject: [PATCH 4/5] Converted README.md to long_description --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c7d908c..e6f2706 100755 --- a/setup.py +++ b/setup.py @@ -22,9 +22,9 @@ # TODO: convert README.md to long_desc # https://gist.github.com/aubricus/9184003#file-setup_snippet-py -HERE = pathlib.Path(__file__).parent +HERE = pathlib.Path(__file__).parent -#The text of the README file +# The text of the README file README = (HERE / "README.md").read_text() setup(name='openrobertalab', From 7046991247f0e5c598246445e9f65817f432983e Mon Sep 17 00:00:00 2001 From: sroopsai Date: Tue, 2 Apr 2019 12:00:54 +0530 Subject: [PATCH 5/5] Converted README.md to long_description --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e6f2706..c39c65f 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,10 @@ HERE = pathlib.Path(__file__).parent # The text of the README file -README = (HERE / "README.md").read_text() +path = HERE/"README.md" + +with path.open(mode='r') as fid: + README = fid.read() setup(name='openrobertalab', version=version,