sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't install vdirsyncer from makefile

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-07-26 13:59:37 +02:00
parent c812b5d50f
commit 20bacfe87e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -28,6 +28,7 @@ env:
install: install:
- "pip install -U pip" - "pip install -U pip"
- "pip install wheel" - "pip install wheel"
- "pip install -e ."
- "make -e install-$BUILD" - "make -e install-$BUILD"
- '[ -z "$PKGS" ] || pip install $PKGS' - '[ -z "$PKGS" ] || pip install $PKGS'
script: script:

7
Makefile
View file

@ -1,9 +1,9 @@
# Packagers who want to run the testsuite against an installed vdirsyncer: # Packagers who want to run the testsuite against an installed vdirsyncer:
# #
# - Create a virtualenv # - Create a virtualenv
# - Inside the virtualenv: `make install-test test`
# - Somehow link your installation of vdirsyncer into the virtualenv, e.g. by # - Somehow link your installation of vdirsyncer into the virtualenv, e.g. by
# using --system-site-packages when creating the virtualenv # using --system-site-packages when creating the virtualenv
# - Inside the virtualenv: `make install-test test`
# #
# The `install-test` target requires internet access. Be aware that vdirsyncer # The `install-test` target requires internet access. Be aware that vdirsyncer
# requires very recent versions of Radicale for the tests to run successfully. # requires very recent versions of Radicale for the tests to run successfully.
@ -29,7 +29,6 @@ install-davserver:
install-test: install-davserver install-test: install-davserver
$(PIP_INSTALL) pytest pytest-xprocess pytest-localserver $(PIP_INSTALL) pytest pytest-xprocess pytest-localserver
[ $(TRAVIS) != "true" ] || $(PIP_INSTALL) coverage coveralls [ $(TRAVIS) != "true" ] || $(PIP_INSTALL) coverage coveralls
$(PIP_INSTALL) -e .
test: test:
if [ "$(TRAVIS)" = "true" ]; then \ if [ "$(TRAVIS)" = "true" ]; then \
@ -39,9 +38,8 @@ test:
py.test; \ py.test; \
fi fi
install-style: install-style: install-vdirsyncer
pip install flake8 flake8-import-order sphinx pip install flake8 flake8-import-order sphinx
pip install -e .
style: style:
flake8 flake8
@ -50,7 +48,6 @@ style:
install-docs: install-docs:
pip install sphinx sphinx_rtd_theme pip install sphinx sphinx_rtd_theme
pip install -e .
docs: docs:
cd docs cd docs