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

Merge test dependencies into dev dependencies

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2021-06-12 15:08:17 +02:00
parent 57d662cba1
commit 86535a9db3
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.builds/tests-minimal.yaml
View file

@ -21,7 +21,7 @@ tasks:
- setup: | - setup: |
sudo systemctl start docker sudo systemctl start docker
cd vdirsyncer cd vdirsyncer
make -e install-test make -e install-dev
- test: | - test: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:

2
.builds/tests-release.yaml
View file

@ -18,7 +18,7 @@ tasks:
- setup: | - setup: |
sudo systemctl start docker sudo systemctl start docker
cd vdirsyncer cd vdirsyncer
make -e install-test -e install-style make -e install-dev -e install-style
- test: | - test: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:

5
Makefile
View file

@ -60,10 +60,6 @@ ci-test-storage:
test: test:
$(PYTEST) $(PYTEST)
install-test: install-dev
pip install -Ur test-requirements.txt
[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
install-style: install-docs install-dev install-style: install-docs install-dev
pip install pre-commit pip install pre-commit
@ -92,6 +88,7 @@ release-deb:
install-dev: install-dev:
pip install -U pip setuptools wheel pip install -U pip setuptools wheel
pip install -e . pip install -e .
pip install -Ur test-requirements.txt $(TEST_EXTRA_PACKAGES)
[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync] [ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \ set -xe && if [ "$(REQUIREMENTS)" = "minimal" ]; then \
pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \ pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \

4
docs/contributing.rst
View file

@ -87,8 +87,8 @@ virtualenv_ and run this inside of it::
# Install git commit hook for some extra linting and checking # Install git commit hook for some extra linting and checking
pre-commit install pre-commit install
# install test dependencies # Install development dependencies
make install-test make install-dev
Then you can run:: Then you can run::

4
docs/packaging.rst
View file

@ -41,9 +41,9 @@ repository or PyPI package. Trying to e.g. run ``pytest`` directly will
require a lot of environment variables to be set (for configuration) and you require a lot of environment variables to be set (for configuration) and you
probably don't want to deal with that. probably don't want to deal with that.
You can install the testing dependencies with:: You can install the all development dependencies with::
make install-test make install-dev
You probably don't want this since it will use pip to download the You probably don't want this since it will use pip to download the
dependencies. Alternatively you can find the testing dependencies in dependencies. Alternatively you can find the testing dependencies in