Increment version to v2.6-beta2

* Update authors to "jrnl contributors" to comply with GPL3
* Include jrnl email address with contributors
* Include GPL notice in jrnl --version
* Apply consistent copyright and license to all Python files
* Add copyright and license to documentation
* Add copyright and license to docs theme
* Wiping poetry cache to try to resolve a test issue
* Testing with Python 3.9.0 in attempt to bypass GitHub Actions failure in 3.9.1
* make format
* Exclude Windows Python 3.9 build which is failing due to a GitHub Actions problem
* Modify testing to get around this 3.9 issue...
* Fix exclude

.github/workflows/changelog.yaml

@@ -35,7 +35,7 @@ jobs:
           if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then
             # This is a tag build (i.e. a release)
             echo '::debug::Release build'
-            if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
+            if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
               echo "::error::Invalid tag format: ${BRANCH}"
               exit 1
             fi

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version (e.g. v2.5 or v2.5.1-beta)'
+        description: 'Version (e.g. v2.5, v2.5.1-beta, v2.6-beta2)'
         required: true
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
       run: |
         JRNL_VERSION="${{ github.event.inputs.version }}"
         echo "::debug::version: $JRNL_VERSION"
-        if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
+        if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
           echo
           echo "::error::Bad version"
           echo

.github/workflows/testing.yaml

@@ -9,7 +9,7 @@ on:
     - 'tests/**'
     - 'poetry.lock'
     - 'pyproject.toml'
-  pull_request_target:
+  pull_request:
     branches: [ develop ]
     paths:
     - 'jrnl/**'
@@ -27,6 +27,9 @@ jobs:
       matrix:
         python-version: [ 3.7, 3.8, 3.9 ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
+        exclude: # Added for GitHub Actions PR problem 2020-12-19 -- remove later!
+          - os: windows-latest
+            python-version: 3.9
 
     steps:
     - uses: actions/checkout@v2
@@ -40,7 +43,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: .venv
-        key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}
+        key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-v2
 
     - name: Install dependencies
       run: |
@@ -67,35 +70,3 @@ jobs:
     - name: Test with behave
       if: success() || failure()
       run: poetry run behave --no-skipped --format progress2 --junit --junit-directory reports/behave
-
-    - name: Upload Unit Test Results
-      if: success() || failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: Unit Test Results
-        path: reports/**/*.xml
-
-  publish-test-results:
-    if: success() || failure()
-    name: "Publish Unit Tests Results"
-    needs: test
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          path: artifacts
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1.4
-        if: always()
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          check_name: Unit Test Results
-          hide_comments: all but latest
-          comment_on_pr: true
-          files: '**/*.xml'
-          report_individual_runs: true
-          deduplicate_classes_by_file_name: false
-

CHANGELOG.md

@@ -16,6 +16,8 @@
 
 **Documentation:**
 
+- Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122)
+- Comply with GPL by acknowledging all authors and including license info in each source file [\#1121](https://github.com/jrnl-org/jrnl/pull/1121)
 - Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118)
 
 ## [v2.6-beta](https://pypi.org/project/jrnl/v2.6-beta/) (2020-12-12)

CONTRIBUTING.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Contributing
 
 We welcome contributions to jrnl, whether it's through reporting bugs, improving the documentation, testing releases, engaging in discussion on features and bugs, or writing code.

docs/advanced.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Advanced Usage
 
 ## Configuration File

docs/encryption.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Encryption
 
 ## A Note on Security

docs/formats.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Formats
 
 `jrnl` supports a variety of alternate formats. These can be used to display your

docs/installation.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Getting started
 
 ## Installation

docs/overview.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Overview
 
 `jrnl` is a simple journal application for the command line.

docs/privacy-and-security.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Privacy and Security
 
 `jrnl` is designed with privacy and security in mind, but like any other

docs/recipes.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # FAQ
 
 ## Recipes

docs/usage.md

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 # Basic Usage #
 
 `jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter

docs_theme/CNAME

@@ -1,2 +0,0 @@
-jrnl.sh
-

docs_theme/assets/colors.css

@@ -1,3 +1,6 @@
+/* Copyright (C) 2012-2021 jrnl contributors
+   License: https://www.gnu.org/licenses/gpl-3.0.html */
+
 :root {
   /* For dark bg */
   --white: #fcfcfc;
@@ -14,7 +17,7 @@
   /* For light bg */
   --teal: #2a8068;
   --dark-blue: #356eb7;
-  --mid-purple: #92679b;
+  --mid-purple: #846392;
   --bright-purple: #af27ad;
   --dark-purple: #604385;
   --darkest-purple: #251A32;

docs_theme/assets/highlight.css

@@ -125,6 +125,14 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
   background: var(--dark-blue);
 }
 
+.rst-content .note.admonition {
+  background: var(--light-blue);
+}
+
 .rst-content .tip .admonition-title {
   background: var(--teal);
 }
+
+.rst-content .tip .admonition {
+  background: var(--light-blue);
+}

docs_theme/assets/index.css

@@ -1,3 +1,5 @@
+/* Copyright (C) 2012-2021 jrnl contributors
+   License: https://www.gnu.org/licenses/gpl-3.0.html */
 /* reset */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
 
 body {
@@ -7,7 +9,7 @@ body {
 }
 
 .icon {
-  background-image: url("img/sprites.svg");
+  background-image: url("/img/sprites.svg");
   width: 32px;
   height: 32px;
   display: inline-block;
@@ -138,7 +140,7 @@ header {
 #twitter:hover,
 #twitter:active {
   text-decoration: none;
-  box-shadow: 0 2px 25px 0 var(--black-shadow);
+  box-shadow: 0 2px 25px 0 var(--blacker-shadow);
   transition: all .5s ease;
 }
 

docs_theme/assets/theme.css

@@ -1,3 +1,6 @@
+/* Copyright (C) 2012-2021 jrnl contributors
+   License: https://www.gnu.org/licenses/gpl-3.0.html */
+
 /* ------------------------------------------------------------ */
 /* Overrides for jrnl theme                                     */
 /* ------------------------------------------------------------ */

docs_theme/index.html

@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2012-2021 jrnl contributors
+     License: https://www.gnu.org/licenses/gpl-3.0.html -->
 <!DOCTYPE html>
 <html lang="en">
 

features/core.feature

@@ -4,13 +4,13 @@ Feature: Functionality of jrnl outside of actually handling journals
         Given we use the config "simple.yaml"
         When we run "jrnl --version"
         Then we should get no error
-        Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
+        Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
 
     Scenario: Displaying the version number
         Given we use the config "simple.yaml"
         When we run "jrnl -v"
         Then we should get no error
-        Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
+        Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
 
     Scenario: Running the diagnostic command
         When we run "jrnl --diagnostic"

features/steps/core.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import ast
 from collections import defaultdict
 import os

features/steps/export_steps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import json
 import os
 import shutil

jrnl/Entry.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 
 from datetime import datetime
 import re

jrnl/FolderJournal.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 
 import codecs
 import fnmatch

jrnl/Journal.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 
 from datetime import datetime
 import logging

jrnl/__init__.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 try:
     from .__version__ import __version__

jrnl/__main__.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import sys
 
 from .cli import cli

jrnl/__version__.py

@@ -1 +1 @@
-__version__ = "v2.6-beta"
+__version__ = "v2.6-beta2"

jrnl/args.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import argparse
 import re
 import textwrap

jrnl/cli.py

@@ -1,21 +1,7 @@
 #!/usr/bin/env python
-"""
-    jrnl
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
-    license: GPLv3, see LICENSE.md for more details.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-"""
 import logging
 import sys
 

jrnl/commands.py

@@ -29,7 +29,13 @@ def preconfig_version(_):
     from jrnl import __title__
     from jrnl import __version__
 
-    version_str = f"{__title__} version {__version__}"
+    version_str = f"""{__title__} version {__version__}
+
+Copyright (C) 2012-2021 jrnl contributors
+
+This is free software, and you are welcome to redistribute it under certain
+conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
+
     print(version_str)
 
 

jrnl/exception.py

@@ -1,3 +1,7 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
+
 class UserAbort(Exception):
     pass
 

jrnl/install.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 
 import glob
 import logging

jrnl/jrnl.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import logging
 import sys
 

jrnl/os_compat.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from sys import platform
 
 on_windows = "win32" in platform

jrnl/output.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import logging
 
 

jrnl/plugins/__init__.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from .fancy_exporter import FancyExporter
 from .jrnl_importer import JRNLImporter

jrnl/plugins/fancy_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from textwrap import TextWrapper
 

jrnl/plugins/jrnl_importer.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import sys
 

jrnl/plugins/json_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import json
 

jrnl/plugins/markdown_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os
 import re

jrnl/plugins/tag_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from .text_exporter import TextExporter
 from .util import get_tags_count

jrnl/plugins/template.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import re
 
 import yaml

jrnl/plugins/template_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from glob import glob
 import os

jrnl/plugins/text_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os
 import re

jrnl/plugins/util.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 
 def get_tags_count(journal):

jrnl/plugins/xml_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from xml.dom import minidom
 

jrnl/plugins/yaml_exporter.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os
 import re

jrnl/prompt.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import getpass
 import sys
 

jrnl/time.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from datetime import datetime
 
 FAKE_YEAR = 9999

jrnl/upgrade.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2021 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import os
 import sys
 

mkdocs.yml

@@ -14,7 +14,7 @@ markdown_extensions:
   - admonition
 repo_url: https://github.com/jrnl-org/jrnl/
 edit_uri: edit/develop/docs/
-site_author: Manuel Ebert
+site_author: jrnl contributors
 site_description: Collect your thoughts and notes without leaving the command line.
 nav:
   - Overview: overview.md

pyproject.toml

@@ -1,8 +1,9 @@
 [tool.poetry]
 name = "jrnl"
-version = "v2.6-beta"
+version = "v2.6-beta2"
 description = "Collect your thoughts and notes without leaving the command line."
 authors = [
+    "jrnl contributors <jrnl-sh@googlegroups.com>",
     "Manuel Ebert <manuel@1450.me>",
     "Jonathan Wren <jonathan@nowandwren.com>",
     "Micah Ellison <micahellison@gmail.com>"