diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index 27eeb340..c5015d5f 100644 --- a/.github/workflows/testing.yaml +++ b/.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 - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bc9a36d9..4bf19932 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,5 @@ + # 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. diff --git a/docs/advanced.md b/docs/advanced.md index 3a0172e7..51c4d1af 100644 --- a/docs/advanced.md +++ b/docs/advanced.md @@ -1,3 +1,5 @@ + # Advanced Usage ## Configuration File diff --git a/docs/encryption.md b/docs/encryption.md index 6b966aa3..ae1af43f 100644 --- a/docs/encryption.md +++ b/docs/encryption.md @@ -1,3 +1,5 @@ + # Encryption ## A Note on Security diff --git a/docs/formats.md b/docs/formats.md index 93aac9ef..99b3e69b 100644 --- a/docs/formats.md +++ b/docs/formats.md @@ -1,3 +1,5 @@ + # Formats `jrnl` supports a variety of alternate formats. These can be used to display your diff --git a/docs/installation.md b/docs/installation.md index 9912a382..ee70893a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -1,3 +1,5 @@ + # Getting started ## Installation diff --git a/docs/overview.md b/docs/overview.md index fdfb2159..57269585 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -1,3 +1,5 @@ + # Overview `jrnl` is a simple journal application for the command line. diff --git a/docs/privacy-and-security.md b/docs/privacy-and-security.md index b93e99a1..39f4863c 100644 --- a/docs/privacy-and-security.md +++ b/docs/privacy-and-security.md @@ -1,3 +1,5 @@ + # Privacy and Security `jrnl` is designed with privacy and security in mind, but like any other diff --git a/docs/recipes.md b/docs/recipes.md index a80a0c09..b7d370a4 100644 --- a/docs/recipes.md +++ b/docs/recipes.md @@ -1,3 +1,5 @@ + # FAQ ## Recipes diff --git a/docs/usage.md b/docs/usage.md index ab7e143f..6d5cd765 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -1,3 +1,5 @@ + # Basic Usage # `jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter diff --git a/docs_theme/assets/colors.css b/docs_theme/assets/colors.css index c8280af3..1a518461 100644 --- a/docs_theme/assets/colors.css +++ b/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; diff --git a/docs_theme/assets/index.css b/docs_theme/assets/index.css index 8aba2fb7..d9e1bf17 100644 --- a/docs_theme/assets/index.css +++ b/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 { diff --git a/docs_theme/assets/theme.css b/docs_theme/assets/theme.css index f394d6d3..9c78ded8 100644 --- a/docs_theme/assets/theme.css +++ b/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 */ /* ------------------------------------------------------------ */ diff --git a/docs_theme/index.html b/docs_theme/index.html index 2570a75c..491da4c7 100755 --- a/docs_theme/index.html +++ b/docs_theme/index.html @@ -1,3 +1,5 @@ + diff --git a/features/core.feature b/features/core.feature index 0861f231..26640c00 100644 --- a/features/core.feature +++ b/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" diff --git a/features/steps/core.py b/features/steps/core.py index 58c0a71d..d579b6d2 100644 --- a/features/steps/core.py +++ b/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 diff --git a/features/steps/export_steps.py b/features/steps/export_steps.py index d7173ace..6a5c8e46 100644 --- a/features/steps/export_steps.py +++ b/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 diff --git a/jrnl/Entry.py b/jrnl/Entry.py index 0ca6c3b5..2a85e015 100755 --- a/jrnl/Entry.py +++ b/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 diff --git a/jrnl/FolderJournal.py b/jrnl/FolderJournal.py index 9a6ea3c0..e727cdf0 100644 --- a/jrnl/FolderJournal.py +++ b/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 diff --git a/jrnl/Journal.py b/jrnl/Journal.py index dc6292b7..1871e3c2 100644 --- a/jrnl/Journal.py +++ b/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 diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 8b0c4181..8f4dc3ec 100644 --- a/jrnl/__init__.py +++ b/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__ diff --git a/jrnl/__main__.py b/jrnl/__main__.py index a67d0add..e977369f 100644 --- a/jrnl/__main__.py +++ b/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 diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 74135de9..68cf1775 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1 +1,4 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + __version__ = "v2.6-beta" diff --git a/jrnl/args.py b/jrnl/args.py index 0ba55961..5efb00ba 100644 --- a/jrnl/args.py +++ b/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 diff --git a/jrnl/cli.py b/jrnl/cli.py index 47b7c303..e010f38e 100644 --- a/jrnl/cli.py +++ b/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 . -""" import logging import sys diff --git a/jrnl/commands.py b/jrnl/commands.py index d8d36571..8473954e 100644 --- a/jrnl/commands.py +++ b/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) diff --git a/jrnl/exception.py b/jrnl/exception.py index 9ed93e25..f1a509f5 100644 --- a/jrnl/exception.py +++ b/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 diff --git a/jrnl/install.py b/jrnl/install.py index 9dff5a1a..a5023815 100644 --- a/jrnl/install.py +++ b/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 diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py index ccbca33e..ad5b07d0 100644 --- a/jrnl/jrnl.py +++ b/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 diff --git a/jrnl/os_compat.py b/jrnl/os_compat.py index 33fd47e1..b38d9d60 100644 --- a/jrnl/os_compat.py +++ b/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 diff --git a/jrnl/output.py b/jrnl/output.py index 624dd8be..43390346 100644 --- a/jrnl/output.py +++ b/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 diff --git a/jrnl/plugins/__init__.py b/jrnl/plugins/__init__.py index 9fcafca2..0d2b39b4 100644 --- a/jrnl/plugins/__init__.py +++ b/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 diff --git a/jrnl/plugins/fancy_exporter.py b/jrnl/plugins/fancy_exporter.py index 7e3358d5..74cc6958 100644 --- a/jrnl/plugins/fancy_exporter.py +++ b/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 diff --git a/jrnl/plugins/jrnl_importer.py b/jrnl/plugins/jrnl_importer.py index 9ea9ee26..af5ea6ce 100644 --- a/jrnl/plugins/jrnl_importer.py +++ b/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 diff --git a/jrnl/plugins/json_exporter.py b/jrnl/plugins/json_exporter.py index 9254e51a..dd07b0ce 100644 --- a/jrnl/plugins/json_exporter.py +++ b/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 diff --git a/jrnl/plugins/markdown_exporter.py b/jrnl/plugins/markdown_exporter.py index 7ee20472..693f2fa5 100644 --- a/jrnl/plugins/markdown_exporter.py +++ b/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 diff --git a/jrnl/plugins/tag_exporter.py b/jrnl/plugins/tag_exporter.py index 89d54a1a..bc3736eb 100644 --- a/jrnl/plugins/tag_exporter.py +++ b/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 diff --git a/jrnl/plugins/template.py b/jrnl/plugins/template.py index d08ae6e8..147cd7af 100644 --- a/jrnl/plugins/template.py +++ b/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 diff --git a/jrnl/plugins/template_exporter.py b/jrnl/plugins/template_exporter.py index f8d704ef..af081f8c 100644 --- a/jrnl/plugins/template_exporter.py +++ b/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 diff --git a/jrnl/plugins/text_exporter.py b/jrnl/plugins/text_exporter.py index ebe50016..7714606c 100644 --- a/jrnl/plugins/text_exporter.py +++ b/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 diff --git a/jrnl/plugins/util.py b/jrnl/plugins/util.py index a030f8d3..04159ca4 100644 --- a/jrnl/plugins/util.py +++ b/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): diff --git a/jrnl/plugins/xml_exporter.py b/jrnl/plugins/xml_exporter.py index 4ffcc731..b9467912 100644 --- a/jrnl/plugins/xml_exporter.py +++ b/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 diff --git a/jrnl/plugins/yaml_exporter.py b/jrnl/plugins/yaml_exporter.py index 0d431967..df3b0548 100644 --- a/jrnl/plugins/yaml_exporter.py +++ b/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 diff --git a/jrnl/prompt.py b/jrnl/prompt.py index 13828620..3cdd3f6f 100644 --- a/jrnl/prompt.py +++ b/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 diff --git a/jrnl/time.py b/jrnl/time.py index 45fc15cc..b9ea8e84 100644 --- a/jrnl/time.py +++ b/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 diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index fb526e97..158f8de3 100644 --- a/jrnl/upgrade.py +++ b/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 diff --git a/mkdocs.yml b/mkdocs.yml index c70d3807..65a515da 100644 --- a/mkdocs.yml +++ b/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 diff --git a/pyproject.toml b/pyproject.toml index 9893cebd..9a082829 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,6 +3,7 @@ name = "jrnl" version = "v2.6-beta" description = "Collect your thoughts and notes without leaving the command line." authors = [ + "jrnl contributors ", "Manuel Ebert ", "Jonathan Wren ", "Micah Ellison "