Documentation
- Fork me on GitHub
+ Get Started
+ Fork on GitHub
- Download
diff --git a/docs/theme/index.js b/docs_theme/index.js
similarity index 100%
rename from docs/theme/index.js
rename to docs_theme/index.js
diff --git a/docs_theme/main.html b/docs_theme/main.html
new file mode 100644
index 00000000..4291adce
--- /dev/null
+++ b/docs_theme/main.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block search_button %}
+
+{% endblock %}
diff --git a/docs/requirements.txt b/docs_theme/requirements.txt
similarity index 100%
rename from docs/requirements.txt
rename to docs_theme/requirements.txt
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 5ae846c9..8c15ce7d 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 5cb5b3e2..fc38b65a 100644
--- a/jrnl/__version__.py
+++ b/jrnl/__version__.py
@@ -1 +1 @@
-__version__ = "v2.5.1-alpha"
+__version__ = "v2.6"
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 ",
"Manuel Ebert ",
"Jonathan Wren ",
"Micah Ellison "
@@ -21,29 +22,30 @@ classifiers = [
]
[tool.poetry.dependencies]
-python = ">=3.7.0, <3.10.0"
-pyxdg = "^0.27.0"
-cryptography = "^3.0"
-passlib = "^1.7"
-parsedatetime = "^2.4"
-keyring = ">19.0, <22.0"
-pytz = ">=2019.1, <2021.0"
-tzlocal = ">1.5, <3.0"
-asteval = "^0.9.14"
-colorama = "^0.4.1"
-python-dateutil = "^2.8"
-pyyaml = "^5.1"
+python = ">=3.7.0, <3.10"
+
ansiwrap = "^0.8.4"
-packaging = "^20.4"
+asteval = "^0.9"
+colorama = ">=0.4" # https://github.com/tartley/colorama/blob/master/CHANGELOG.rst
+cryptography = ">=3.0" # https://cryptography.io/en/latest/api-stability.html
+keyring = ">=21.0" # https://github.com/jaraco/keyring#integration
+parsedatetime = ">=2.6"
+python-dateutil = "^2.8" # https://github.com/dateutil/dateutil/blob/master/RELEASING
+pyxdg = ">=0.27.0"
+pyyaml = ">=5.1"
+
+# dayone-only deps
+pytz = ">=2020" # https://pythonhosted.org/pytz/#issues-limitations
+tzlocal = ">2.0, <3.0" # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
[tool.poetry.dev-dependencies]
behave = "^1.2"
mkdocs = "^1.0"
black = {version = "^20.8b1",allow-prereleases = true}
-toml = "^0.10.0"
-pyflakes = "^2.2.0"
-pytest = "^6.1.2"
-yq = "^2.11.1"
+toml = ">=0.10"
+pyflakes = ">=2.2.0"
+pytest = ">=6.2"
+yq = ">=2.11"
[tool.poetry.scripts]
jrnl = 'jrnl.cli:cli'
@@ -56,6 +58,5 @@ known_first_party = ["jrnl"]
force_sort_within_sections = true
[build-system]
-requires = ["poetry>=0.12"]
+requires = ["poetry>=1.1"]
build-backend = "poetry.masonry.api"
-
diff --git a/readthedocs.yml b/readthedocs.yml
index dabbddc7..f74f3d23 100644
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -19,4 +19,4 @@ formats:
python:
version: 3.7
install:
- - requirements: docs/requirements.txt
+ - requirements: docs_theme/requirements.txt
+
+