Merge master into dav_default_ns

Author: Hugo Osvaldo Barrera

.builds/style.yaml

@@ -0,0 +1,16 @@
+image: archlinux
+packages:
+  - docker
+  - docker-compose
+  - python-pip
+sources:
+  - https://github.com/pimutils/vdirsyncer
+tasks:
+  - setup: |
+      cd vdirsyncer
+      make -e install-style
+  - test: |
+      cd vdirsyncer
+      # Non-system python is used for packages:
+      export PATH=$PATH:~/.local/bin/
+      make -e style

.builds/tests-minimal.yaml

@@ -0,0 +1,26 @@
+# TODO: Maybe shift this job to ubuntu/debian.
+image: archlinux
+packages:
+  - docker
+  - docker-compose
+  - python-pip
+sources:
+  - https://github.com/pimutils/vdirsyncer
+environment:
+  BUILD: test
+  CI: true
+  CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79
+  REQUIREMENTS: minimal
+  # TODO: ETESYNC_TESTS
+tasks:
+  - setup: |
+      cd vdirsyncer
+      sudo systemctl start docker
+      DAV_SERVER="radicale xandikos" make -e install-test
+  - test: |
+      cd vdirsyncer
+      # Non-system python is used for packages:
+      export PATH=$PATH:~/.local/bin/
+      make -e ci-test
+      DAV_SERVER=radicale make -e ci-test-storage
+      DAV_SERVER=xandikos make -e ci-test-storage

.builds/tests-release.yaml

@@ -0,0 +1,25 @@
+image: archlinux
+packages:
+  - docker
+  - docker-compose
+  - python-pip
+sources:
+  - https://github.com/pimutils/vdirsyncer
+environment:
+  BUILD: test
+  CI: true
+  CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79
+  REQUIREMENTS: release
+  # TODO: ETESYNC_TESTS
+tasks:
+  - setup: |
+      cd vdirsyncer
+      sudo systemctl start docker
+      DAV_SERVER="radicale xandikos" make -e install-test
+  - test: |
+      cd vdirsyncer
+      # Non-system python is used for packages:
+      export PATH=$PATH:~/.local/bin/
+      make -e ci-test
+      DAV_SERVER=radicale make -e ci-test-storage
+      DAV_SERVER=xandikos make -e ci-test-storage

.pre-commit-config.yaml

@@ -5,7 +5,6 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
       - id: end-of-file-fixer
-        exclude: '.travis.yml'
       - id: check-toml
       - id: check-added-large-files
       - id: debug-statements
@@ -18,12 +17,3 @@ repos:
     rev: v2.3.0
     hooks:
     -   id: reorder-python-imports
-  - repo: local
-    hooks:
-      - id: update-travis
-        name: Update travis job definition
-        description: Ensures that travis job definition are up to date.
-        entry: scripts/make_travisconf.py
-        files: '.*travis.*'
-        stages: [commit]
-        language: script

.travis.yml

@@ -1,6 +1,5 @@
 # setuptools-scm includes everything tracked by git
 prune docker
-prune docker-compose
 prune scripts
 prune tests/storage/servers
 prune tests/storage/etesync

MANIFEST.in

@@ -15,7 +15,7 @@ export DETERMINISTIC_TESTS := false
 # Run the etesync testsuite.
 export ETESYNC_TESTS := false
 
-# Assume to run in Travis. Don't use this outside of a virtual machine. It will
+# Assume to run in CI. Don't use this outside of a virtual machine. It will
 # heavily "pollute" your system, such as attempting to install a new Python
 # systemwide.
 export CI := false
@@ -41,17 +41,17 @@ export TESTSERVER_BASE := ./tests/storage/servers/
 CODECOV_PATH = /tmp/codecov.sh
 
 ifeq ($(CI), true)
-test-storage:
-	curl -s https://codecov.io/bash > $(CODECOV_PATH)
-	$(PYTEST) tests/storage/
-	bash $(CODECOV_PATH) -c -F storage
-test:
+ci-test:
 	curl -s https://codecov.io/bash > $(CODECOV_PATH)
 	$(PYTEST) tests/unit/
 	bash $(CODECOV_PATH) -c -F unit
 	$(PYTEST) tests/system/
 	bash $(CODECOV_PATH) -c -F system
 	[ "$(ETESYNC_TESTS)" = "false" ] || make test-storage
+ci-test-storage:
+	curl -s https://codecov.io/bash > $(CODECOV_PATH)
+	$(PYTEST) tests/storage/
+	bash $(CODECOV_PATH) -c -F storage
 else
 test:
 	$(PYTEST)
@@ -79,10 +79,6 @@ install-test: install-servers install-dev
 	fi
 	[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
 
-install-test-storage: install-test
-	# This is just an alias
-	true
-
 install-style: install-docs install-dev
 	pip install pre-commit
 
@@ -120,12 +116,4 @@ install-dev:
 		pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \
 	fi
 
-ssh-submodule-urls:
-	git submodule foreach "\
-		echo -n 'Old: '; \
-		git remote get-url origin; \
-		git remote set-url origin \$$(git remote get-url origin | sed -e 's/https:\/\/github\.com\//[email protected]:/g'); \
-		echo -n 'New URL: '; \
-		git remote get-url origin"
-
 .PHONY: docs

Makefile

@@ -2,8 +2,8 @@
 vdirsyncer
 ==========
 
-.. image:: https://travis-ci.org/pimutils/vdirsyncer.svg?branch=master
-  :target: https://travis-ci.org/pimutils/vdirsyncer
+.. image:: https://builds.sr.ht/~whynothugo/vdirsyncer.svg
+  :target: https://builds.sr.ht/~whynothugo/vdirsyncer
   :alt: CI status
 
 .. image:: https://codecov.io/github/pimutils/vdirsyncer/coverage.svg?branch=master

README.rst

@@ -266,7 +266,7 @@ in terms of data safety**. See `this blog post
 <https://evertpot.com/google-carddav-issues/>`_ for the details.  Always back
 up your data.
 
-At first run you will be asked to authorize application for google account
+At first run you will be asked to authorize application for Google account
 access.
 
 To use this storage type, you need to install some additional dependencies::