From bb092a1a7f53cb8121bc62f3f92dc2ca66cd93cd Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Wed, 22 Nov 2017 18:46:12 -0500 Subject: [PATCH] pytest fix --- rever.xsh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rever.xsh b/rever.xsh index 6112334d2..8d2fdced9 100644 --- a/rever.xsh +++ b/rever.xsh @@ -10,16 +10,22 @@ $VERSION_BUMP_PATTERNS = [ ] $CHANGELOG_FILENAME = 'CHANGELOG.rst' $CHANGELOG_TEMPLATE = 'TEMPLATE.rst' + +$PYTEST_COMMAND = "rm -r .cache/ __pycache__/ */__pycache__ */*/__pycache__ && pytest" + $TAG_REMOTE = 'git@github.com:xonsh/xonsh.git' $TAG_TARGET = 'master' $GHPAGES_REPO = 'git@github.com:scopatz/xonsh-docs.git' with open('requirements-tests.txt') as f: - $DOCKER_CONDA_DEPS = f.read().split() + conda_deps = f.read().split() with open('requirements-docs.txt') as f: - $DOCKER_CONDA_DEPS += f.read().split() -$DOCKER_CONDA_DEPS = [d.lower() for d in set($DOCKER_CONDA_DEPS)] + conda_deps += f.read().split() +conda_deps = {d.lower().split('=')[0] for d in set(conda_deps)} +conda_deps.discard('prompt-toolkit') +conda_deps.add('prompt_toolkit') +$DOCKER_CONDA_DEPS = sorted(conda_deps) $DOCKER_INSTALL_COMMAND = './setup.py install' $DOCKER_GIT_NAME = 'xonsh' $DOCKER_GIT_EMAIL = 'xonsh@googlegroups.com'