Merge branch 'dev'

agateau · Feb 10, 2019 · 6bf2535 · 6bf2535
2 parents 8595a34 + 18922f0
commit 6bf2535
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 61 deletions.
diff --git a/NEWS b/NEWS
@@ -1,11 +1,21 @@
-v1.x.y unreleased
-
+v1.2.0 unreleased
 - New features:
-    - A new command has been added: `p_merge`, to merge a project into another.
+    - The new `p_merge` command lets you merge a project into another.
     - It is now possible to turn a task into a note with `t_to_note` and a note into a task with `n_to_task`.
+- Bug fixes:
+    - The `k_remove` command no longer ignores unused keywords.
+    - HTML output has been fixed to no longer output strings wrapped in `b""`.
+    - `t_list` filtering has been fixed so that `t_list --urgency 0` filters out tasks with a negative urgency, as expected.
+- Improvements:
+    - HTML output has been refreshed:
+        - It looks more modern now.
+        - Some fields have been removed (doneDate, creationDate).
+        - The title, keywords and description fields have been merged.
+        - An ID field has been added (handy to run a command on a task listed in the output).
+        - Columns now use human-friendly titles.
 - Misc:
-    - Added the `--datadir` option. It replaces the `--db` option, which is now deprecated and will be removed in the next version.
-    - Similarly, the `YOKADI_DB` environment variable is now deprecated.
+    - The `--db` option is now deprecated and replaced by the `--datadir` option. `--db` will be removed in the next version.
+    - Similarly, the `YOKADI_DB` environment variable is now deprecated and will be removed in the next version.
     - Yokadi no longer supports cryptography: encrypted databases will be decrypted at update.
 
 v1.1.1 2016/11/11

diff --git a/doc/dev/release.md b/doc/dev/release.md
@@ -2,71 +2,42 @@
 
 ## Introduction
 
-A series is major.minor (ex: 0.12). There is a branch for each series.
-
-A version is major.minor.patch (ex 0.12.1). There is a tag for each version.
-
 This doc assumes there is a checkout of yokadi.github.com next to the checkout
 of yokadi.
 
 ## In yokadi checkout
 
     export version=<version>
-    export series=<series>
-
-### For a new series
-
-Update `NEWS` file (add changes, check release date)
-
-Ensure `yokadi/__init__.py` file contains $version
-
-Create branch:
-
-    git checkout -b $series
-    git push -u origin $series
-
-The version in master should always be bigger than the version in release
-branches, so update version in master:
-
-    git checkout master
-    vi yokadi/__init__.py
-    git commit version -m "Bump version number"
-    git push
-    git checkout -
 
-### For a new release in an existing series
+Check dev is clean
 
-    git checkout <series>
+    git checkout dev
+    git pull
+    git status
 
 Update `NEWS` file (add changes, check release date)
 
-Bump version number
-
-    echo $version > version
-    git commit NEWS version -m "Getting ready for $version"
-
-### Common
+Ensure `yokadi/__init__.py` file contains $version
 
 Build archives
 
     ./scripts/mkdist.sh ../yokadi.github.com/download
 
-Tag
-
-    git tag -a $version -m "Releasing $version"
-
 Push changes
 
     git push
-    git push --tags
 
-Merge changes in master (so that future forward merges are simpler). Be careful
-to keep version to its master value.
+When CI has checked the branch, merge changes in master
 
     git checkout master
-    git merge --no-ff $series
+    git pull
+    git merge dev
     git push
-    git checkout -
+
+Tag the release
+
+    git tag -a $version -m "Releasing $version"
+    git push --tags
 
 ## In yokadi.github.com checkout
 

diff --git a/man/yokadi.1 b/man/yokadi.1
@@ -19,8 +19,8 @@ These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
 .TP
-.B \-d, FILE \-\-db=FILE
-TODO database.
+.B \-\-datadir=<DIR>
+Database directory.
 .TP
 .B \-c, \-\-create-only
 Just create an empty database.

diff --git a/man/yokadid.1 b/man/yokadid.1
@@ -22,8 +22,8 @@ These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
 .TP
-.B \-d, FILE \-\-db=FILE
-TODO database.
+.B \-\-datadir=<DIR>
+Database directory.
 .TP
 .B \-k, \-\-kill
 Kill Yokadi Daemon (you can specify database with \-db if you run multiple

diff --git a/scripts/mkdist.sh b/scripts/mkdist.sh
@@ -24,24 +24,20 @@ WORK_DIR=$(mktemp -d "$DST_DIR/yokadi-dist.XXXXXX")
 log "Copying source"
 cp -a --no-target-directory "$SRC_DIR" "$WORK_DIR"
 
-log "Check we are not master"
-cd "$WORK_DIR"
-BRANCH=$(git branch | awk '$1 == "*" { print $2 }')
-[ "$BRANCH" != "master" ] || die "Source dir should point to a release branch checkout, not master!"
-
 log "Cleaning"
+cd "$WORK_DIR"
 git reset --hard HEAD
 git clean -q -dxf
 
 log "Building archives"
-./setup.py -q sdist --formats=bztar,zip
+./setup.py -q sdist --formats=gztar,zip
 
 log "Installing archive"
 cd dist/
-YOKADI_TARBZ2=$(ls ./*.tar.bz2)
-tar xf "$YOKADI_TARBZ2"
+YOKADI_TARGZ=$(ls ./*.tar.gz)
+tar xf "$YOKADI_TARGZ"
 
-ARCHIVE_DIR="$PWD/${YOKADI_TARBZ2%.tar.bz2}"
+ARCHIVE_DIR="$PWD/${YOKADI_TARGZ%.tar.gz}"
 
 virtualenv --python python3 "$WORK_DIR/venv"
 (
@@ -62,6 +58,6 @@ virtualenv --python python3 "$WORK_DIR/venv"
 
 log "Moving archives out of work dir"
 cd "$WORK_DIR/dist"
-mv ./*.tar.bz2 ./*.zip "$DST_DIR"
+mv ./*.tar.gz ./*.zip "$DST_DIR"
 rm -rf "$WORK_DIR"
 log "Done"