Merge branch 'develop' into add-tox-1361

Conflicts:
poetry.lock
pyproject.toml

.github/workflows/changelog.yaml

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 name: Changelog
 
 on:

.github/workflows/docs.yaml

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 name: Docs
 
 on:

.github/workflows/release.yaml

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 name: Release
 on:
   workflow_dispatch:

.github/workflows/testing_prs.yaml

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 name: Testing
 
 on:

.github/workflows/testing_schedule.yaml

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 name: Testing
 
 on:

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [Unreleased](https://github.com/jrnl-org/jrnl/)
+
+[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v3.0-beta...HEAD)
+
+**Fixed bugs:**
+
+- Adding new entry with date only works with format m.d.Y [\#1509](https://github.com/jrnl-org/jrnl/issues/1509)
+
+**Build:**
+
+- Replace `make` with python alternative \(`poe`\) [\#1503](https://github.com/jrnl-org/jrnl/pull/1503) ([wren](https://github.com/wren))
+- Update copyright year [\#1502](https://github.com/jrnl-org/jrnl/pull/1502) ([wren](https://github.com/wren))
+
 ## [v3.0-beta](https://pypi.org/project/jrnl/v3.0-beta/) (2022-06-11)
 
 [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.8.4...v3.0-beta)

CONTRIBUTING.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Contributing
 
 See "[Contributing](docs/contributing.md)" in the `docs` directory.

README.md

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 <p align="center">
 <a href="https://jrnl.sh">
 <img align="center" src="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/docs_theme/assets/readme-header.png"/>

docs/advanced.md

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

docs/contributing.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Contributing to jrnl
 
 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/encryption.md

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

docs/external-editors.md

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # External editors
 
 Configure your preferred external editor by updating the `editor` option

docs/formats.md

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

docs/journal-types.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Journal Types
 `jrnl` can store your journal in a few different ways:
 

docs/overview.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 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,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 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/reference-command-line.md

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Command Line Reference
 
 ## Synopsis

docs/reference-config-file.md

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Configuration File Reference
 
 `jrnl` stores its information in a YAML configuration file.

docs/tips-and-tricks.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 # Tips and Tricks
 
 This page contains tips and tricks for using `jrnl`, often in conjunction

docs/usage.md

@@ -1,5 +1,8 @@
-<!-- Copyright (C) 2012-2021 jrnl contributors
-     License: https://www.gnu.org/licenses/gpl-3.0.html -->
+<!--
+Copyright (C) 2012-2022 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/assets/colors.css

@@ -1,5 +1,7 @@
-/* Copyright (C) 2012-2021 jrnl contributors
-   License: https://www.gnu.org/licenses/gpl-3.0.html */
+/*
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+*/
 
 :root {
   /* For dark bg */

docs_theme/assets/highlight.css

@@ -1,4 +1,7 @@
 /*
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Atom One Dark With support for ReasonML by Gidi Morris, based off work by
 Daniel Gamage
 

docs_theme/assets/index.css

@@ -1,5 +1,8 @@
-/* Copyright (C) 2012-2021 jrnl contributors
-   License: https://www.gnu.org/licenses/gpl-3.0.html */
+/*
+Copyright (C) 2012-2022 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 {

docs_theme/assets/theme.css

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

docs_theme/index.html

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

docs_theme/main.html

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 {% extends "base.html" %}
 
 {%- block search_button %}

docs_theme/search.html

@@ -1,3 +1,8 @@
+<!--
+Copyright (C) 2012-2022 jrnl contributors
+License: https://www.gnu.org/licenses/gpl-3.0.html
+-->
+
 {% extends "main.html" %}
 
 {% block content %}

jrnl/DayOneJournal.py

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

jrnl/EncryptedJournal.py

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

jrnl/Entry.py

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

jrnl/FolderJournal.py

@@ -1,8 +1,6 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-
 import codecs
 import fnmatch
 import os

jrnl/Journal.py

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

jrnl/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 try:

jrnl/__main__.py

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

jrnl/args.py

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

jrnl/cli.py

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

jrnl/color.py

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

jrnl/commands.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 """
 Functions in this file are standalone commands. All standalone commands are split into
 two categories depending on whether they require the config to be loaded to be able to
@@ -38,7 +41,7 @@ def preconfig_version(_):
 
     version_str = f"""{__title__} version {__version__}
 
-Copyright (C) 2012-2021 jrnl contributors
+Copyright (C) 2012-2022 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"""

jrnl/config.py

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

jrnl/editor.py

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

jrnl/exception.py

@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from jrnl.messages import Message
 from jrnl.output import print_msg
 

jrnl/install.py

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

jrnl/jrnl.py

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

jrnl/messages/Message.py

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

jrnl/messages/MsgStyle.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from enum import Enum
 from typing import NamedTuple
 from typing import Callable

jrnl/messages/MsgText.py

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

jrnl/messages/__init__.py

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

jrnl/os_compat.py

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

jrnl/output.py

@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
+
 import textwrap
 
 from typing import Union

jrnl/override.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from .config import update_config, make_yaml_valid_dict
 from argparse import Namespace
 

jrnl/path.py

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

jrnl/plugins/__init__.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from .fancy_exporter import FancyExporter

jrnl/plugins/dates_exporter.py

@@ -1,6 +1,6 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from collections import Counter
 
 from .text_exporter import TextExporter

jrnl/plugins/fancy_exporter.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from jrnl.exception import JrnlException

jrnl/plugins/jrnl_importer.py

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

jrnl/plugins/json_exporter.py

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

jrnl/plugins/markdown_exporter.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os

jrnl/plugins/tag_exporter.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from .text_exporter import TextExporter

jrnl/plugins/text_exporter.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os

jrnl/plugins/util.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 

jrnl/plugins/xml_exporter.py

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 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,4 @@
-# encoding: utf-8
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 import os

jrnl/prompt.py

@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from jrnl.messages import Message
 from jrnl.messages import MsgText
 from jrnl.messages import MsgStyle

jrnl/time.py

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

jrnl/upgrade.py

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

poetry.lock

@@ -118,7 +118,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 
 [[package]]
 name = "colorama"
-version = "0.4.4"
+version = "0.4.5"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
@@ -846,7 +846,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "stack-data"
-version = "0.2.0"
+version = "0.3.0"
 description = "Extract data from python stack frames and tracebacks for informative displays"
 category = "dev"
 optional = false
@@ -908,7 +908,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "traitlets"
-version = "5.2.2.post1"
+version = "5.3.0"
 description = ""
 category = "dev"
 optional = false
@@ -1016,7 +1016,7 @@ testing = []
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9.0, <3.12"
-content-hash = "9375baa3ce8200e049bb6618ba517587879e38e0b8491e133f99c45db97c18de"
+content-hash = "ceca9186ac31a0b8ec81a6cc134469842080c786971bb8642d9e67d51bd73fca"
 
 [metadata.files]
 ansiwrap = [
@@ -1129,8 +1129,8 @@ click = [
     {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
 ]
 colorama = [
-    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
+    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
 ]
 commonmark = [
     {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
@@ -1489,8 +1489,8 @@ six = [
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 stack-data = [
-    {file = "stack_data-0.2.0-py3-none-any.whl", hash = "sha256:999762f9c3132308789affa03e9271bbbe947bf78311851f4d485d8402ed858e"},
-    {file = "stack_data-0.2.0.tar.gz", hash = "sha256:45692d41bd633a9503a5195552df22b583caf16f0b27c4e58c98d88c8b648e12"},
+    {file = "stack_data-0.3.0-py3-none-any.whl", hash = "sha256:aa1d52d14d09c7a9a12bb740e6bdfffe0f5e8f4f9218d85e7c73a8c37f7ae38d"},
+    {file = "stack_data-0.3.0.tar.gz", hash = "sha256:77bec1402dcd0987e9022326473fdbcc767304892a533ed8c29888dacb7dddbc"},
 ]
 textwrap3 = [
     {file = "textwrap3-0.9.2-py2.py3-none-any.whl", hash = "sha256:bf5f4c40faf2a9ff00a9e0791fed5da7415481054cef45bb4a3cfb1f69044ae0"},
@@ -1509,8 +1509,8 @@ tox = [
     {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"},
 ]
 traitlets = [
-    {file = "traitlets-5.2.2.post1-py3-none-any.whl", hash = "sha256:1530d04badddc6a73d50b7ee34667d4b96914da352109117b4280cb56523a51b"},
-    {file = "traitlets-5.2.2.post1.tar.gz", hash = "sha256:74803a1baa59af70f023671d86d5c7a834c931186df26d50d362ee6a1ff021fd"},
+    {file = "traitlets-5.3.0-py3-none-any.whl", hash = "sha256:65fa18961659635933100db8ca120ef6220555286949774b9cfc106f941d1c7a"},
+    {file = "traitlets-5.3.0.tar.gz", hash = "sha256:0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2"},
 ]
 typing-extensions = [
     {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"},

tests/bdd/features/build.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Build process
 
     Scenario: Version numbers should stay in sync

tests/bdd/features/change_time.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Change entry times in journal
     Scenario Outline: Change time flag changes single entry timestamp
         Given we use the config "<config_file>"

tests/bdd/features/config_file.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Multiple journals
 
     Scenario: Read a journal from an alternate config

tests/bdd/features/core.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Functionality of jrnl outside of actually handling journals
 
     Scenario: Displaying the version number

tests/bdd/features/datetime.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Reading and writing to journal with custom date formats
 
     Scenario: Dates can include a time

tests/bdd/features/delete.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Delete entries from journal
     Scenario Outline: Delete flag allows deletion of single entry
         Given we use the config "<config_file>"

tests/bdd/features/encrypt.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Encrypting and decrypting journals
 
     Scenario: Decrypting a journal

tests/bdd/features/file_storage.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Journals iteracting with the file system in a way that users can see
 
     Scenario: Adding entries to a Folder journal should generate date files

tests/bdd/features/format.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Custom formats
 
     Scenario Outline: Short printing via --format flag

tests/bdd/features/import.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Importing data
 
     Scenario Outline: --import allows new entry from stdin

tests/bdd/features/multiple_journals.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Multiple journals
 
     Scenario: Loading a config with two journals

tests/bdd/features/override.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Implementing Runtime Overrides for Select Configuration Keys
 
         Scenario: Override configured editor with built-in input === editor:''

tests/bdd/features/password.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Using the installed keyring
 
     Scenario: Storing a password in keyring

tests/bdd/features/search.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Searching in a journal
 
     Scenario Outline: Displaying entries using -on today should display entries created today

tests/bdd/features/star.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Starring entries
 
     Scenario Outline: Starring an entry will mark it in the journal file

tests/bdd/features/tag.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Tagging
 # See search.feature for tag-related searches
 # And format.feature for tag-related output

tests/bdd/features/upgrade.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Upgrading Journals from 1.x.x to 2.x.x
 
     Scenario: Upgrade and parse journals with square brackets

tests/bdd/features/write.feature

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 Feature: Writing new entries.
 
     Scenario Outline: Multiline entry with punctuation should keep title punctuation

tests/bdd/test_features.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from pytest_bdd import scenarios
 
 scenarios("features/build.feature")

tests/conftest.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from pytest import mark

tests/lib/fixtures.py

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

tests/lib/given_steps.py

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

tests/lib/helpers.py

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

tests/lib/then_steps.py

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

tests/lib/when_steps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
 from contextlib import ExitStack

tests/unit/test_color.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2012-2022 jrnl contributors
+# License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from colorama import Fore
 from colorama import Style
 import pytest

tests/unit/test_config_file.py

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

tests/unit/test_export.py

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

tests/unit/test_install.py

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

tests/unit/test_jrnl.py

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

tests/unit/test_os_compat.py

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

tests/unit/test_output.py

@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2021 jrnl contributors
+# Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
+
 from unittest.mock import Mock
 from unittest.mock import patch
 

tests/unit/test_override.py

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