From 94e439b423427494c35f42d26262c6f8b43ec429 Mon Sep 17 00:00:00 2001 From: dhood Date: Tue, 20 Mar 2018 10:34:22 -0700 Subject: [PATCH] Revert "Pin flake8-builtins to sidestep regression (#129)" (#130) This reverts commit ae6bdae9d936ed8a7414576e58d39e676322e64f. --- ros2_batch_job/__main__.py | 2 +- ros2_batch_job/osx_batch/__init__.py | 3 +++ ros2_batch_job/windows_batch/__init__.py | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py index 9aeccd5b4..712e09258 100644 --- a/ros2_batch_job/__main__.py +++ b/ros2_batch_job/__main__.py @@ -50,7 +50,7 @@ 'coverage', 'flake8', 'flake8-blind-except', - 'flake8-builtins==1.0.post0', + 'flake8-builtins', 'flake8-class-newline', 'flake8-comprehensions', 'flake8-deprecated', diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 4c344adb2..54d2cb486 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -51,6 +51,9 @@ def pre(self): # See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367 os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + '/usr/local/opt/qt' + def post(self): + pass + def show_env(self): # Show the env self.run(['export'], shell=True) diff --git a/ros2_batch_job/windows_batch/__init__.py b/ros2_batch_job/windows_batch/__init__.py index ac3d6c43f..65808ce93 100644 --- a/ros2_batch_job/windows_batch/__init__.py +++ b/ros2_batch_job/windows_batch/__init__.py @@ -30,6 +30,9 @@ def pre(self): if 'ROS_DOMAIN_ID' not in os.environ: os.environ['ROS_DOMAIN_ID'] = '119' + def post(self): + pass + def show_env(self): # Show the env self.run(['set'], shell=True)