Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,19 @@ matrix:
finish_fast: true
allow_failures:
- env: TMUX_VERSION=master
- python: pypy3
cache:
- pip
- apt
- directories:
- ~/source
- ~/build
before_install:
- pip install poetry
- poetry --version
- poetry version
install:
- pip install -e .
- pip install -r requirements/test.txt
- pip install -r requirements/dev.txt
- poetry install -v
before_script:
- mkdir -p ~/source
- mkdir -p ~/build/tmux-$TMUX_VERSION
Expand All @@ -51,7 +54,7 @@ before_script:
- cd $TRAVIS_BUILD_DIR
- tmux -V
script:
- py.test --cov
- poetry run py.test --cov
- make flake8
addons:
apt:
Expand Down
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ current
- Travis: Only run on master and PRs one time
- Travis: Add caching for tmux builds
- Travis: Test 2.9 and 3.0a
- :issue:`613`: Move from Pipenv to Poetry

1.5.4 <2019-11-06>
------------------
Expand Down
15 changes: 4 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ entr_warn:
@echo "----------------------------------------------------------"

isort:
isort `${PY_FILES}`
poetry run isort `${PY_FILES}`

black:
black `${PY_FILES}` --skip-string-normalization
poetry run black `${PY_FILES}` --skip-string-normalization

test:
py.test $(test)
poetry run py.test $(test)

watch_test:
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) test; else $(MAKE) test entr_warn; fi
Expand All @@ -27,14 +27,7 @@ watch_docs:
cd doc && $(MAKE) watch_docs

flake8:
flake8 tmuxp tests
poetry run flake8 tmuxp tests

watch_flake8:
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) flake8; else $(MAKE) flake8 entr_warn; fi

sync_pipfile:
pipenv install --skip-lock --dev -r requirements/doc.txt && \
pipenv install --skip-lock --dev -r requirements/dev.txt && \
pipenv install --skip-lock --dev -r requirements/test.txt && \
pipenv install --skip-lock --dev -e . && \
pipenv install --skip-lock -r requirements/base.txt
33 changes: 0 additions & 33 deletions Pipfile

This file was deleted.

Loading