bump version, merge remote-tracking branch 'origin/devel'

casperdcl · Sep 5, 2019 · 15e973e · 15e973e
2 parents 249db66 + b1d960b
commit 15e973e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,11 +20,15 @@ matrix:
     - docker
     after_success:
     - echo "$DOCKER_PWD" | docker login -u $DOCKER_USR --password-stdin
+    - echo "$GITHUB_TOKEN" | docker login docker.pkg.github.com -u $GITHUB_USR --password-stdin
     - make -B docker
     - |
       if [[ -n "$TRAVIS_TAG" ]]; then
-      docker tag casperdcl/git-fame:latest casperdcl/git-fame:${TRAVIS_TAG#v} ; fi
+      docker tag casperdcl/git-fame:latest casperdcl/git-fame:${TRAVIS_TAG#v}
+      docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:${TRAVIS_TAG#v} ; fi
     - docker tag casperdcl/git-fame:latest casperdcl/git-fame:devel
+    - docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:latest
+    - docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:devel
     - pip install .[dev]
     - make build
     - openssl aes-256-cbc -K $encrypted_88867ca921c3_key
@@ -51,12 +55,22 @@ matrix:
       script: docker push casperdcl/git-fame:${TRAVIS_TAG#v}
       on:
         tags: true
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:${TRAVIS_TAG#v}
+      on:
+        tags: true
     - provider: script
       script: docker push casperdcl/git-fame:latest
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:latest
     - provider: script
       script: docker push casperdcl/git-fame:devel
       on:
         branch: devel
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:devel
+      on:
+        branch: devel
   - python: pypy2.7-5.10.0
     env: TOXENV=pypy
   - python: pypy3.5-5.10.0

diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ testtimer:
 	nosetests gitfame --with-timer -d -v
 
 gitfame/git-fame.1: .meta/.git-fame.1.md gitfame/_gitfame.py
-	python -m gitfame --help | tail -n+9 | head -n-2 |\
+	python -m gitfame --help | tail -n+11 | head -n-2 |\
     sed -r -e 's/\\/\\\\/g' \
       -e 's/^  (--\S+) (\S+)\s*(.*)$$/\n\\\1=*\2*\n: \3/' \
       -e 's/^  (-\S+, )(-\S+)\s*/\n\\\1\\\2\n: /' |\

diff --git a/gitfame/_version.py b/gitfame/_version.py
@@ -12,7 +12,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 1, 10, 0
+version_info = 1, 10, 1
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

diff --git a/gitfame/git-fame.1 b/gitfame/git-fame.1
@@ -33,7 +33,7 @@ git\ fame\ \-\-incl\ \[aq]\\.[cht][puh]{0,2}$\[aq]\ \-twMC
 .SH OPTIONS
 .TP
 .B <gitdir>
-[default: ./] optional arguments:
+[default: ./]
 .RS
 .RE
 .TP
@@ -124,6 +124,11 @@ show program\[aq]s version number and exit
 data [default: False].
 .RE
 .TP
+.B \-e, \-\-show\-email
+Show author email instead of name [default: False].
+.RS
+.RE
+.TP
 .B \-M, \-M
 Detect intra\-file line moves and copies [default: False].
 .RS