Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support empy v3 and v4. #1076

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −5
Draft

Support empy v3 and v4. #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dd90fc
Relax empy constraint to allow empy 3 and 4.
nuclearsandwich Dec 4, 2024
7e9a207
Use ! instead of : for else.
nuclearsandwich Dec 3, 2024
2c0f990
Ignore `#!` when processing script templates.
nuclearsandwich Dec 3, 2024
ff8bfb7
Use Hook import from emlib for empy 4.
nuclearsandwich Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions ros_buildfarm/scripts/release/generate_release_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,23 @@
import re
import sys

from em import BANGPATH_OPT
from em import Hook
try:
# Import bangpath option name from EmPy v3
from em import BANGPATH_OPT
BANGPATH_VALUE = False
except ImportError:
# EmPy 4 does not define an import-able constant for the updated bangpath
# option and inverts its meaning.
BANGPATH_OPT = 'ignoreBangpaths'
BANGPATH_VALUE = True


try:
from em import Hook
except:
from emlib import Hook


from ros_buildfarm.argument import add_argument_arch
from ros_buildfarm.argument import add_argument_build_name
from ros_buildfarm.argument import add_argument_config_url
Expand Down Expand Up @@ -151,7 +166,7 @@ def beforeInclude(self, *args, **kwargs):
'source_scripts': source_scripts,
'binary_scripts': binary_scripts,
'package_format': package_format},
options={BANGPATH_OPT: False})
options={BANGPATH_OPT: BANGPATH_VALUE})
value = re.sub(r'(^| )python3 ', r'\1' + sys.executable + ' ', value, flags=re.M)
print(value)

Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/snippet/builder_parameterized-trigger.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@[if parameter_files]@
<hudson.plugins.parameterizedtrigger.FileBuildParameters>
<propertiesFile>@(','.join(ESCAPE(parameter_files)))</propertiesFile>
<failTriggerOnMissing>@(vars().get('missing_parameter_files_skip', False) ? 'true' : 'false')</failTriggerOnMissing>
<failTriggerOnMissing>@(vars().get('missing_parameter_files_skip', False) ? 'true' ! 'false')</failTriggerOnMissing>
<textParamValueOnNewLine>false</textParamValueOnNewLine>
<useMatrixChild>false</useMatrixChild>
<onlyExactRuns>false</onlyExactRuns>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'scripts': scripts,
'zip_safe': False,
'install_requires': [
'empy<4',
'empy',
'PyYAML'],
'extras_require': {
'test': [
Expand Down
Loading