|
95 | 95 | import subprocess |
96 | 96 | import sys |
97 | 97 | from contextlib import contextmanager |
98 | | -from shutil import copy as copyfile |
99 | | -from shutil import rmtree |
| 98 | +from shutil import copy as copyfile, rmtree |
100 | 99 | from tempfile import mkdtemp |
101 | 100 |
|
102 | 101 | import click |
@@ -242,14 +241,7 @@ def cli(): |
242 | 241 | def install(runtime, toolkit, environment, editable, source): |
243 | 242 | """Install project and dependencies into a clean EDM environment.""" |
244 | 243 | parameters = get_parameters(runtime, toolkit, environment) |
245 | | - packages = ( |
246 | | - dependencies |
247 | | - # | extra_dependencies.get(toolkit, set()) |
248 | | - # | extra_dependencies["test"] |
249 | | - # | extra_dependencies["examples"] |
250 | | - # | extra_dependencies["editors"] |
251 | | - | ci_dependencies |
252 | | - ) |
| 244 | + packages = (dependencies | ci_dependencies) |
253 | 245 |
|
254 | 246 | # edm commands to setup the development environment |
255 | 247 | commands = [ |
@@ -508,7 +500,8 @@ def flake8(runtime, toolkit, environment, strict): |
508 | 500 | if strict: |
509 | 501 | config = "--config=flake8_strict.cfg " |
510 | 502 | commands = [ |
511 | | - "edm run -e {environment} -- python -m flake8 " + config, |
| 503 | + "edm run -e {environment} -- python -m flake8 --ignore=H101 " |
| 504 | + "--exclude=build" + config, |
512 | 505 | ] |
513 | 506 | execute(commands, parameters) |
514 | 507 |
|
@@ -630,8 +623,8 @@ def get_parameters(runtime, toolkit, environment): |
630 | 623 | } |
631 | 624 | if toolkit not in supported_combinations[runtime]: |
632 | 625 | msg = ( |
633 | | - "Python {runtime} and toolkit {toolkit} not supported by " |
634 | | - + "test environments" |
| 626 | + "Python {runtime} and toolkit {toolkit} not supported by " |
| 627 | + "test environments" |
635 | 628 | ) |
636 | 629 | raise RuntimeError(msg.format(**parameters)) |
637 | 630 | if environment is None: |
|
0 commit comments