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

Jump to bottom

Flake8 etstool.py #669

Merged
merged 2 commits into from
Aug 17, 2020
Merged

Flake8 etstool.py #669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1a107
Flake8 etstool.py
kitchoi Aug 14, 2020
3829733
No need to break
kitchoi Aug 14, 2020
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
30 changes: 20 additions & 10 deletions etstool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"pyside": {"pyside"},
# XXX once pyside2 is available in EDM, we will want it here
"pyside2": set(),
"pyqt": {"pyqt<4.12"}, # FIXME: build of 4.12-1 appears to be bad
"pyqt": {"pyqt<4.12"}, # FIXME: build of 4.12-1 appears to be bad
"pyqt5": {"pyqt5"},
# XXX once wxPython 4 is available in EDM, we will want it here
"wx": set(),
Expand Down Expand Up @@ -177,13 +177,17 @@ def install(edm, runtime, toolkit, environment, editable, source):

# edm commands to setup the development environment
if sys.platform == 'linux':
commands = ["edm environments create {environment} --platform=rh6-x86_64 --force --version={runtime}"]
commands = [
"edm environments create {environment} --platform=rh6-x86_64 --force --version={runtime}", # noqa: E501
]
else:
commands = ["edm environments create {environment} --force --version={runtime}"]
commands = [
"edm environments create {environment} --force --version={runtime}"
]

commands.extend([
"{edm} install -y -e {environment} " + packages,
"{edm} run -e {environment} -- pip install -r ci-src-requirements.txt --no-dependencies",
"{edm} run -e {environment} -- pip install -r ci-src-requirements.txt --no-dependencies", # noqa: E501
"{edm} run -e {environment} -- python setup.py clean --all",
install_pyface,
])
Expand All @@ -199,12 +203,12 @@ def install(edm, runtime, toolkit, environment, editable, source):
elif toolkit == "wx":
if sys.platform == "darwin":
commands.append(
"{edm} run -e {environment} -- python -m pip install wxPython<4.1"
"{edm} run -e {environment} -- python -m pip install wxPython<4.1" # noqa: E501
)
elif sys.platform == "linux":
# XXX this is mainly for TravisCI workers; need a generic solution
commands.append(
"{edm} run -e {environment} -- pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/ wxPython<4.1"
"{edm} run -e {environment} -- pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/ wxPython<4.1" # noqa: E501
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is tangential but we're not using the ubuntu 14.04 images on travis (i think xenial is 16.04) at the moment so i don't know if we should be using this url to download the expython wheels.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep xenial is 16.04 - https://docs.travis-ci.com/user/reference/linux#overview

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, probably needs a different image. Not in this PR though.

)
else:
commands.append(
Expand All @@ -215,15 +219,21 @@ def install(edm, runtime, toolkit, environment, editable, source):
execute(commands, parameters)

if source:
cmd_fmt = "edm plumbing remove-package --environment {environment} --force "
commands = [cmd_fmt+dependency for dependency in source_dependencies.keys()]
cmd_fmt = (
"edm plumbing remove-package --environment {environment} --force "
)
commands = [
cmd_fmt+dependency for dependency in source_dependencies.keys()
]
execute(commands, parameters)
source_pkgs = source_dependencies.values()
commands = [
"python -m pip install {pkg} --no-deps".format(pkg=pkg)
for pkg in source_pkgs
]
commands = ["edm run -e {environment} -- " + command for command in commands]
commands = [
"edm run -e {environment} -- " + command for command in commands
]
execute(commands, parameters)

click.echo("Done install")
Expand Down Expand Up @@ -359,7 +369,7 @@ def api_docs(edm, runtime, toolkit, environment):
ignore = " ".join(doc_ignore)
commands = [
"{edm} install -y -e {environment} " + packages,
"{edm} run -e {environment} -- pip install -r doc-src-requirements.txt --no-dependencies",
"{edm} run -e {environment} -- pip install -r doc-src-requirements.txt --no-dependencies", # noqa: E501
]
click.echo(
"Installing documentation tools in '{environment}'".format(
Expand Down