Skip to content

Commit

Permalink
Merge branch 'master' into 65-improve-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Swen Wenzel committed Nov 12, 2019
2 parents 5c2d53a + 56bd871 commit c6f2cf4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -21,8 +21,8 @@ before_install:
- bash -c "scripts/wait-for-it.sh ${SCHEMA_REGISTRY_URL} -t 60"
install:
- pip install -U pip
- pip install coverage coveralls
- pip install --pre poetry
#TODO unpin once it's more stable
- pip install coverage coveralls "poetry==1.0.0b3"
- poetry install -vvv --no-root
script:
- "$TEST_CMD"
Expand Down
2 changes: 1 addition & 1 deletion esque/cli/commands.py
Expand Up @@ -129,7 +129,7 @@ def config_autocomplete(state: State):
source_designator = "source" if current_shell in ["bash", "sh"] else "source_zsh"
default_environment = ".bashrc" if current_shell in ["bash", "sh"] else ".zshrc"
with open(config_file.absolute(), "w") as config_fd:
config_fd.write("_ESQUE_COMPLETE=" + source_designator + " esque")
config_fd.write('eval "$(_ESQUE_COMPLETE=' + source_designator + ' esque)"')
click.echo("Autocompletion script generated to " + green_bold(str(config_file.absolute())))
click.echo(
"To use the autocompletion feature, simply source the contents of the script into your environment, e.g."
Expand Down
6 changes: 4 additions & 2 deletions pyproject.toml
Expand Up @@ -51,7 +51,8 @@ pytest = "^5.2"
pytest-mock = "^1.11"
pytest-cov = "^2.8"
flake8 = "^3.7"
black = {version = "*", allows-prereleases = true}
#TODO unpin once it's more stable
black = {version = "19.3b0", allows-prereleases = true}
isort = "^4.3"

[tool.black]
Expand All @@ -65,5 +66,6 @@ multi_line_output = 3
include_trailing_comma = true

[build-system]
requires = ["poetry>=1.0.0b3"]
#TODO unpin once it's more stable
requires = ["poetry==1.0.0b3"]
build-backend = "poetry.masonry.api"

0 comments on commit c6f2cf4

Please sign in to comment.