Merge branch 'master' into open

Author: nkakouros

.coveragerc

@@ -1,6 +1,3 @@
-[report]
-omit = */python2.7/*,*/test*,*/__init__.py
-[paths]
-source =
-    .
-    /root/.vim/bundle/taskwiki
+[run]
+source = taskwiki, extra
+data_file = /tmp/taskwiki-coverage/.coverage

.github/workflows/tests.yaml

@@ -0,0 +1,76 @@
+name: tests
+on: [push, pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - _defaults: # see Dockerfile for variable defaults
+          - TASK_VERSION: v2.4.4
+          - TASK_VERSION: 2.5.2
+            continue-on-error: true
+          - TASK_VERSION: 2.6.0
+          - VIM_VERSION: v7.4.1546
+          - VIM_VERSION: v8.0.0027
+          - VIM_VERSION: v8.1.0519
+          - VIMWIKI_VERSION: dev
+          - PYTHON_VERSION: 3.5
+          - PYTHON_VERSION: 3.6
+          - PYTHON_VERSION: 3.7
+    continue-on-error: ${{ matrix.continue-on-error == true }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare docker image
+        run: |
+          set -ex -o pipefail
+          shopt -s lastpipe
+          git ls-remote https://github.com/GothenburgBitFactory/taskwarrior.git heads/"$TASK_VERSION" | read -r TASK_DEVEL_SHA _ || :
+          (
+            echo ALPINE_VERSION="$ALPINE_VERSION"
+            echo PYTHON_VERSION="$PYTHON_VERSION"
+            echo TASK_VERSION="$TASK_VERSION" ${TASK_DEVEL_SHA:+TASK_DEVEL_SHA="$TASK_DEVEL_SHA"}
+            echo VIM_VERSION="$VIM_VERSION"
+            echo VIMWIKI_VERSION="$VIMWIKI_VERSION"
+            cat Dockerfile
+          ) | sha256sum | read -r tag _
+          docker login "$DOCKER_REGISTRY" -u "$GITHUB_USER" -p "$GITHUB_TOKEN" || :
+          docker pull "$DOCKER_CACHE_IMAGE":"$tag" || :
+          DOCKER_BUILDKIT=1 docker build \
+            --build-arg BUILDKIT_INLINE_CACHE=1 \
+            --cache-from "$DOCKER_CACHE_IMAGE":"$tag" \
+            ${ALPINE_VERSION:+--build-arg ALPINE_VERSION="$ALPINE_VERSION"} \
+            ${PYTHON_VERSION:+--build-arg PYTHON_VERSION="$PYTHON_VERSION"} \
+            ${TASK_VERSION:+--build-arg TASK_VERSION="$TASK_VERSION"} \
+            ${VIM_VERSION:+--build-arg VIM_VERSION="$VIM_VERSION"} \
+            ${VIMWIKI_VERSION:+--build-arg VIMWIKI_VERSION="$VIMWIKI_VERSION"} \
+            -t taskwiki_tests \
+            .
+          docker tag taskwiki_tests "$DOCKER_CACHE_IMAGE":"$tag"
+          docker push "$DOCKER_CACHE_IMAGE":"$tag" || :
+        env:
+          ALPINE_VERSION: ${{ matrix.ALPINE_VERSION }}
+          PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+          TASK_VERSION: ${{ matrix.TASK_VERSION }}
+          VIM_VERSION: ${{ matrix.VIM_VERSION }}
+          VIMWIKI_VERSION: ${{ matrix.VIMWIKI_VERSION }}
+          DOCKER_REGISTRY: docker.pkg.github.com
+          DOCKER_CACHE_IMAGE: docker.pkg.github.com/${{ github.repository }}/taskwiki_tests
+          GITHUB_USER: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Test
+        run: make test PYTEST_FLAGS="-n8"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+
+  coveralls-finished:
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Finished
+        uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

.travis.yml

@@ -1,37 +1,92 @@
-FROM fedora:27
-ARG TASK_VERSION
+ARG ALPINE_VERSION=3.12
+ARG PYTHON_VERSION=3
+ARG TASK_VERSION=v2.5.1
+ARG VIM_VERSION=v8.2.0716
+ARG VIMWIKI_VERSION=master
+
+
+FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} AS build
 
-RUN dnf update -y
-RUN dnf install procps-ng psmisc which vim curl git gvim gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
-
-# Setup language environment
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-
-# Setup taskwarrior
-RUN git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior.git task
-WORKDIR task
-RUN echo ${TASK_VERSION}; git checkout ${TASK_VERSION}
-RUN git clean -dfx
-RUN git submodule init
-RUN git submodule update
-RUN cmake -DCMAKE_BUILD_TYPE=release .
-RUN make -j2
+
+FROM build AS build-vim
+RUN apk add --no-cache \
+    gcc \
+    git \
+    gtk+3.0-dev \
+    libxt-dev \
+    make \
+    musl-dev \
+    ncurses-dev
+ARG VIM_VERSION
+RUN git clone --depth 1 --recurse-submodules --shallow-submodules \
+    --branch $VIM_VERSION https://github.com/vim/vim /usr/src/vim
+WORKDIR /usr/src/vim
+# "backport" https://github.com/vim/vim/commit/16d7eced1a08565a9837db8067c7b9db5ed68854
+RUN sed -i -e '/#\s*undef _POSIX_THREADS/d' src/if_python3.c
+RUN ./configure --prefix=/opt/vim --enable-pythoninterp --enable-python3interp --enable-gui=gtk3
+RUN make -j$(nproc)
+RUN make install
+
+
+FROM build AS build-taskwarrior
+RUN apk add --no-cache \
+    cmake \
+    g++ \
+    gcc \
+    git \
+    make \
+    util-linux-dev
+ARG TASK_VERSION
+RUN git clone --depth 1 --recurse-submodules --shallow-submodules \
+    --branch $TASK_VERSION https://github.com/GothenburgBitFactory/taskwarrior /usr/src/taskwarrior
+WORKDIR /usr/src/taskwarrior
+RUN cmake -DCMAKE_INSTALL_PREFIX=/opt/taskwarrior -DCMAKE_BUILD_TYPE=release -DENABLE_SYNC=OFF .
+RUN make -j$(nproc)
 RUN make install
-RUN task --version
-
-# Setup vimwiki
-RUN mkdir -p /root/.vim/bundle /root/.vim/autoload
-RUN curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
-RUN cd /root/.vim/bundle; git clone https://github.com/vimwiki/vimwiki.git
-RUN cd /root/.vim/bundle/vimwiki/; git checkout dev
-
-# Setup taskwiki
-RUN pip3 install nose pytest coveralls coverage vimrunner
-ADD requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt
-RUN mkdir /root/.vim/bundle/taskwiki
-WORKDIR /root/.vim/bundle/taskwiki
 
-CMD ["sh", "-c", "python3 -m pytest -vv tests/"]
+
+FROM build AS build-pip
+# coverage needs to build a C extensions, otherwise it's slow
+RUN apk add --no-cache \
+    gcc \
+    linux-headers \
+    musl-dev
+RUN pip install --root=/opt/pip-root \
+    coverage \
+    coveralls \
+    pytest \
+    pytest-cov \
+    pytest-xdist \
+    https://github.com/liskin/vimrunner-python/archive/8c19ff88050c09236e7519425bfae33c687483df.zip
+COPY requirements.txt /tmp/taskwiki/requirements.txt
+RUN pip install --root=/opt/pip-root \
+    -r /tmp/taskwiki/requirements.txt
+
+
+FROM build AS tests
+RUN apk add --no-cache \
+    git \
+    make \
+    patchelf \
+    tzdata \
+    xvfb-run
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+
+COPY --from=build-vim /opt/vim/ /opt/vim/
+COPY --from=build-taskwarrior /opt/taskwarrior/ /opt/taskwarrior/
+COPY --from=build-pip /opt/pip-root/ /
+
+# install runtime deps of vim/taskwarrior
+RUN patchelf --print-needed /opt/*/bin/* \
+  | grep -v '^libpython' \
+  | sort -u \
+  | sed -e 's/^/so:/' \
+  | xargs -rt apk add --no-cache
+ENV PATH=/opt/vim/bin:/opt/taskwarrior/bin:$PATH
+RUN task --version && vim --version
+
+ARG VIMWIKI_VERSION
+RUN git clone --depth 1 --recurse-submodules --shallow-submodules \
+    --branch $VIMWIKI_VERSION https://github.com/vimwiki/vimwiki /root/.vim/bundle/vimwiki
+
+WORKDIR /root/.vim/bundle/taskwiki

Dockerfile

@@ -1,3 +1,16 @@
+export LC_ALL := en_US.UTF-8
+
+PYTHON ?= python3
+
 test:
-	mkdir -p /tmp/taskwiki-coverage
-	docker-compose up --exit-code-from tests
+	docker-compose run --rm tests make xvfb-cover-pytest
+
+pytest:
+	$(PYTHON) -m pytest -vv $(PYTEST_FLAGS) tests/
+
+cover-pytest: PYTEST_FLAGS += --cov=taskwiki
+cover-pytest: pytest
+	if [ "$$GITHUB_ACTIONS" ]; then coveralls || :; fi
+
+xvfb-%:
+	xvfb-run --server-args=-noreset $(MAKE) $*

Makefile

@@ -3,8 +3,8 @@
 _Proper project management in vim.
 Standing on the shoulders of vimwiki and Taskwarrior_
 
-[![Travis build status](https://travis-ci.org/tbabej/taskwiki.svg?branch=master)](https://travis-ci.org/tbabej/taskwiki)
-[![Coverage Status](https://coveralls.io/repos/tbabej/taskwiki/badge.svg?branch=master)](https://coveralls.io/r/tbabej/taskwiki?branch=master)
+[![GitHub Actions build status](https://github.com/tools-life/taskwiki/workflows/tests/badge.svg?branch=master)](https://github.com/tools-life/taskwiki/actions)
+[![Coverage Status](https://coveralls.io/repos/tools-life/taskwiki/badge.svg?branch=master)](https://coveralls.io/r/tools-life/taskwiki?branch=master)
 [![Code Health](https://landscape.io/github/tbabej/taskwiki/master/landscape.svg?style=flat)](https://landscape.io/github/tbabej/taskwiki/master)
 [![Chat with developers](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tbabej/taskwiki)
 
@@ -43,7 +43,7 @@ developed with Python2 compatibility in mind.
 Using pathogen (or similar vim plugin manager), the taskwiki install is
 as simple as:
 
-    git clone https://github.com/tbabej/taskwiki ~/.vim/bundle/taskwiki
+    git clone https://github.com/tools-life/taskwiki ~/.vim/bundle/taskwiki
 
 However, make sure your box satisfies the requirements stated above.
 
@@ -265,7 +265,7 @@ Taskwarrior community. Come hang out at #taskwarrior on Freenode.
 
 ### Contributing
 
-Code and issue tracker is hosted at: https://github.com/tbabej/taskwiki
+Code and issue tracker is hosted at: https://github.com/tools-life/taskwiki
 
 Feel free to submit pull requests and/or file issues for bugs and suggestions.
 
@@ -274,25 +274,32 @@ Feel free to submit pull requests and/or file issues for bugs and suggestions.
 Taskwiki comes with preconfigured docker-based test setup. To run the tests,
 simply issue:
 
+    PYTEST_FLAGS="-n8" make test
+
+To run a single test and show vim errors:
+
+    PYTEST_FLAGS="-s -k TestChooseProject" make test
+
+You may also build a docker image with different versions of some dependencies:
+
     docker-compose build --build-arg TASK_VERSION=2.6.0 tests
-    docker-compose up
 
 To run the included tests directly you will require
 
 * [test.py](http://pytest.org)
 * [gvim](http://vim.org)
-* [vimrunner-python](https://github.com/andri-ch/vimrunner-python) (with the included default_vimrc)
+* [vimrunner-python](https://github.com/liskin/vimrunner-python) (with the included default_vimrc)
 
 Note also, that the tests depend on language specific messages. So you might
 need to install and enable either the `en_US` or `en_GB` locale. For example:
 
     LANG=en_US python -m pytest
 
-Finally you might want to have a look at [the travis configuration](.travis.yml)
+Finally you might want to have a look at [the CI configuration](.github/workflows/tests.yaml)
 and consider using a virtual machine or [Xvfb](https://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml).
 
 #### Known issues
 
-When `tzlocal` library can't detect your local timezone, it has to be set [explicitly](https://github.com/tbabej/taskwiki/issues/110) using the environment variable `TZ`. For example, before launching vim:
+When `tzlocal` library can't detect your local timezone, it has to be set [explicitly](https://github.com/tools-life/taskwiki/issues/110) using the environment variable `TZ`. For example, before launching vim:
 
     export TZ="Europe/Prague"

README.md

@@ -6,7 +6,8 @@ endif
 " Detect if conceal feature is available
 let s:conceal = exists("+conceallevel") ? ' conceal': ''
 
-syntax match TaskWikiTask /\s*\* \[.\]\s.*$/
+syntax match TaskWikiTask /\s*\* \[.\]\s.*$/ contains=@TaskWikiTaskContains
+syntax cluster TaskWikiTaskContains
        \ contains=VimwikiListTodo,
                 \ VimwikiTag,
                 \ VimwikiEmoticons,
@@ -39,12 +40,13 @@ endfor
 
 " Define active and deleted task regions
 " Will be colored dynamically by Meta().source_tw_colors()
-syntax match TaskWikiTaskActive containedin=TaskWikiTask contained /\s*\*\s\[S\]\s[^#]*/
-syntax match TaskWikiTaskCompleted containedin=TaskWikiTask contained /\s*\*\s\[X\]\s[^#]*/
-syntax match TaskWikiTaskDeleted containedin=TaskWikiTask contained /\s*\*\s*\[D\]\s[^#]*/
-syntax match TaskWikiTaskRecurring containedin=TaskWikiTask contained /\s*\*\s\[R\]\s[^#]*/
-syntax match TaskWikiTaskWaiting containedin=TaskWikiTask contained /\s*\*\s\[W\]\s[^#]*/
-syntax match TaskWikiTaskPriority containedin=TaskWikiTask contained /\( !\| !!\| !!!\)\( \)\@=/
+syntax match TaskWikiTaskActive containedin=TaskWikiTask contained contains=@TaskWikiTaskContains /\s*\*\s\[S\]\s[^#]*/
+syntax match TaskWikiTaskCompleted containedin=TaskWikiTask contained contains=@TaskWikiTaskContains /\s*\*\s\[X\]\s[^#]*/
+syntax match TaskWikiTaskDeleted containedin=TaskWikiTask contained contains=@TaskWikiTaskContains /\s*\*\s*\[D\]\s[^#]*/
+syntax match TaskWikiTaskRecurring containedin=TaskWikiTask contained contains=@TaskWikiTaskContains /\s*\*\s\[R\]\s[^#]*/
+syntax match TaskWikiTaskWaiting containedin=TaskWikiTask contained contains=@TaskWikiTaskContains /\s*\*\s\[W\]\s[^#]*/
+syntax match TaskWikiTaskPriority contained /\( !\| !!\| !!!\)\( \)\@=/
+syntax cluster TaskWikiTaskContains add=TaskWikiTaskPriority
 
 " Set concealed parts as really concealed in normal mode, and with cursor over
 " (unless disabled by user)
@@ -56,7 +58,7 @@ endif
 " Configure custom FoldText function
 " Altered version of the VimwikiFoldText
 setlocal foldmethod=syntax
-setlocal viewoptions=folds
+setlocal viewoptions-=options
 
 function! TaskwikiFoldText()
   let line = getline(v:foldstart)