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

Simplify travis setup a bit

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2020-06-08 18:11:47 +02:00
parent 7e4a0be674
commit b4bbc5946a
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -13,9 +13,6 @@
}, },
"install": [ "install": [
". scripts/travis-install.sh", ". scripts/travis-install.sh",
"pip install -U pip setuptools",
"pip install wheel",
"make -e install-dev",
"make -e install-$BUILD" "make -e install-$BUILD"
], ],
"language": "python", "language": "python",

5
Makefile
View file

@ -71,7 +71,7 @@ install-servers:
(cd $(TESTSERVER_BASE)$$server && sh install.sh); \ (cd $(TESTSERVER_BASE)$$server && sh install.sh); \
done done
install-test: install-servers install-test: install-servers install-dev
pip install -Ur test-requirements.txt pip install -Ur test-requirements.txt
set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \ set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \
pip install -U --force-reinstall \ pip install -U --force-reinstall \
@ -81,7 +81,7 @@ install-test: install-servers
fi fi
[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES) [ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
install-style: install-docs install-style: install-docs install-dev
pip install -U flake8 flake8-import-order flake8-bugbear autopep8 pip install -U flake8 flake8-import-order flake8-bugbear autopep8
style: style:
@ -114,6 +114,7 @@ release-deb:
sh scripts/release-deb.sh ubuntu zesty sh scripts/release-deb.sh ubuntu zesty
install-dev: install-dev:
pip install -U pip setuptools wheel
pip install -e . pip install -e .
[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync] [ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
set -xe && if [ "$(REQUIREMENTS)" = "devel" ]; then \ set -xe && if [ "$(REQUIREMENTS)" = "devel" ]; then \

3
scripts/make_travisconf.py
View file

@ -22,9 +22,6 @@ cfg['branches'] = {
cfg['install'] = """ cfg['install'] = """
. scripts/travis-install.sh . scripts/travis-install.sh
pip install -U pip setuptools
pip install wheel
make -e install-dev
make -e install-$BUILD make -e install-$BUILD
""".strip().splitlines() """.strip().splitlines()