From 861bf983327490cff6ea75a1084d59bad03e7bf7 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 13:27:10 -0800 Subject: [PATCH 1/8] Small accessibility fixes for docs site (#1122) * remove old file that was only needed for gh-pages * fix broken icons on docs home page * add more contrast to twitter button hover state * tweak non-accessible color to meet standard * tweak non-accessible colors to meet standard --- docs_theme/CNAME | 2 -- docs_theme/assets/colors.css | 2 +- docs_theme/assets/highlight.css | 8 ++++++++ docs_theme/assets/index.css | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 docs_theme/CNAME diff --git a/docs_theme/CNAME b/docs_theme/CNAME deleted file mode 100644 index 027bab94..00000000 --- a/docs_theme/CNAME +++ /dev/null @@ -1,2 +0,0 @@ -jrnl.sh - diff --git a/docs_theme/assets/colors.css b/docs_theme/assets/colors.css index 331928f9..c8280af3 100644 --- a/docs_theme/assets/colors.css +++ b/docs_theme/assets/colors.css @@ -14,7 +14,7 @@ /* For light bg */ --teal: #2a8068; --dark-blue: #356eb7; - --mid-purple: #92679b; + --mid-purple: #846392; --bright-purple: #af27ad; --dark-purple: #604385; --darkest-purple: #251A32; diff --git a/docs_theme/assets/highlight.css b/docs_theme/assets/highlight.css index a73ce087..b7052917 100644 --- a/docs_theme/assets/highlight.css +++ b/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); +} diff --git a/docs_theme/assets/index.css b/docs_theme/assets/index.css index e08cab71..8aba2fb7 100644 --- a/docs_theme/assets/index.css +++ b/docs_theme/assets/index.css @@ -7,7 +7,7 @@ body { } .icon { - background-image: url("img/sprites.svg"); + background-image: url("/img/sprites.svg"); width: 32px; height: 32px; display: inline-block; @@ -138,7 +138,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; } From a14c2c4ded7e754612840c79b6290cf2688a858d Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 19 Dec 2020 21:28:48 +0000 Subject: [PATCH 2/8] Update changelog [ci skip] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97943e56..a137c3a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ **Documentation:** +- Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122) - 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) From c5729420a4b7cebad5f8ce5fcda4c26016d82444 Mon Sep 17 00:00:00 2001 From: Micah Jerome Ellison Date: Sat, 19 Dec 2020 14:53:15 -0800 Subject: [PATCH 3/8] Comply with GPL by acknowledging all authors and including license info in each source file (#1121) * 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/testing.yaml | 39 ++++--------------------------- CONTRIBUTING.md | 2 ++ docs/advanced.md | 2 ++ docs/encryption.md | 2 ++ docs/formats.md | 2 ++ docs/installation.md | 2 ++ docs/overview.md | 2 ++ docs/privacy-and-security.md | 2 ++ docs/recipes.md | 2 ++ docs/usage.md | 2 ++ docs_theme/assets/colors.css | 3 +++ docs_theme/assets/index.css | 2 ++ docs_theme/assets/theme.css | 3 +++ docs_theme/index.html | 2 ++ features/core.feature | 4 ++-- features/steps/core.py | 3 +++ features/steps/export_steps.py | 3 +++ jrnl/Entry.py | 3 +++ jrnl/FolderJournal.py | 3 +++ jrnl/Journal.py | 3 +++ jrnl/__init__.py | 2 ++ jrnl/__main__.py | 3 +++ jrnl/__version__.py | 3 +++ jrnl/args.py | 3 +++ jrnl/cli.py | 18 ++------------ jrnl/commands.py | 8 ++++++- jrnl/exception.py | 4 ++++ jrnl/install.py | 3 +++ jrnl/jrnl.py | 3 +++ jrnl/os_compat.py | 3 +++ jrnl/output.py | 3 +++ jrnl/plugins/__init__.py | 2 ++ jrnl/plugins/fancy_exporter.py | 2 ++ jrnl/plugins/jrnl_importer.py | 2 ++ jrnl/plugins/json_exporter.py | 2 ++ jrnl/plugins/markdown_exporter.py | 2 ++ jrnl/plugins/tag_exporter.py | 2 ++ jrnl/plugins/template.py | 3 +++ jrnl/plugins/template_exporter.py | 2 ++ jrnl/plugins/text_exporter.py | 2 ++ jrnl/plugins/util.py | 2 ++ jrnl/plugins/xml_exporter.py | 2 ++ jrnl/plugins/yaml_exporter.py | 2 ++ jrnl/prompt.py | 3 +++ jrnl/time.py | 3 +++ jrnl/upgrade.py | 3 +++ mkdocs.yml | 2 +- pyproject.toml | 1 + 48 files changed, 122 insertions(+), 54 deletions(-) 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 " From bacab5f8712ce8b087e3ad3376d08c972aa0f55f Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 19 Dec 2020 22:54:47 +0000 Subject: [PATCH 4/8] Update changelog [ci skip] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a137c3a7..ae8e2c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ **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) From 08fb53a6d44db8264d1d2ede4334369d6b80438c Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 15:07:45 -0800 Subject: [PATCH 5/8] standardize version regex in release pipeline (#1124) --- .github/workflows/changelog.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index 471acb79..ffacd90e 100644 --- a/.github/workflows/changelog.yaml +++ b/.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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 67d70065..b8474967 100644 --- a/.github/workflows/release.yaml +++ b/.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 From 6dbe2a1df414b78e9f707d969d09cbc3dc4d699a Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 16:36:25 -0800 Subject: [PATCH 6/8] do additional check for json data, and retry for 5-ish minutes on failure (#1125) --- .github/workflows/release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b8474967..c959d810 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -162,7 +162,15 @@ jobs: run: brew install pipgrip - name: Query PyPI API - run: curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json + uses: nick-invision/retry@v2 + with: + timeout_seconds: 10 + max_attempts: 30 + retry_wait_seconds: 10 + command: | + curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json + # if query doesn't have our version yet, give it some time before trying again + [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]] && exit 1 - name: Update Homebrew Formula run: > From 258ab85bb7fd46dae249c2550ea01a07be6703ab Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 16:56:23 -0800 Subject: [PATCH 7/8] add more debug data to changelog workflow, update changelog --- .github/workflows/changelog.yaml | 4 ++-- .github/workflows/release.yaml | 34 ++++++++++++++++++++++---------- CHANGELOG.md | 4 ++-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index ffacd90e..62cf0408 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -56,7 +56,7 @@ jobs: if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then # Normal build on a branch (no tag) - echo "::debug::BRANCH: $BRANCH" + echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)" echo "::debug::GITHUB_SHA: $GITHUB_SHA" echo "::error::$BRANCH has been updated since build started. Aborting changelog." exit 1 @@ -130,7 +130,7 @@ jobs: echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV - name: Commit - if: env.SOMETHING_CHANGED + if: env.SOMETHING_CHANGED == 'true' run: | git config user.email "jrnl.bot@gmail.com" git config user.name "Jrnl Bot" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c959d810..884a8c48 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -75,6 +75,7 @@ jobs: git add pyproject.toml jrnl/__version__.py git commit -m "Increment version to ${JRNL_VERSION}" git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION" + git push git push --tags - name: Build @@ -170,18 +171,31 @@ jobs: command: | curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json # if query doesn't have our version yet, give it some time before trying again - [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]] && exit 1 + if [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]]; then + echo "::debug::PYPI_VERSION: $PYPI_VERSION" + echo "::debug::JQ VALUE: $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" + echo "::group::cat api_response.json" + cat api_response.json + echo "::endgroup::" + exit 1 + fi - name: Update Homebrew Formula - run: > - brew bump-formula-pr "Formula/${FORMULA_NAME}.rb" - --url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json) - --sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json) - --version=$PYPI_VERSION - --no-audit - --write - --commit - --force + uses: nick-invision/retry@v2 + with: + timeout_minutes: 8 + max_attempts: 6 + retry_wait_seconds: 30 + command: > + brew bump-formula-pr "Formula/${FORMULA_NAME}.rb" + --url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json) + --sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json) + --version=$PYPI_VERSION + --no-audit + --write + --commit + --force + --verbose - name: Update commit message run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8e2c8b..085ac509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## [Unreleased](https://github.com/jrnl-org/jrnl/) +## [v2.6-beta3](https://pypi.org/project/jrnl/v2.6-beta3/) (2020-12-19) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta3) **Fixed bugs:** From d4135383d6811afe09949cbd20439f2762b58853 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sun, 20 Dec 2020 02:24:38 +0000 Subject: [PATCH 8/8] Increment version to v2.6-beta5 --- jrnl/__version__.py | 5 +---- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 68cf1775..2765f166 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1,4 +1 @@ -# Copyright (C) 2012-2021 jrnl contributors -# License: https://www.gnu.org/licenses/gpl-3.0.html - -__version__ = "v2.6-beta" +__version__ = "v2.6-beta5" diff --git a/pyproject.toml b/pyproject.toml index 9a082829..9c1dee37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.6-beta" +version = "v2.6-beta5" description = "Collect your thoughts and notes without leaving the command line." authors = [ "jrnl contributors ",