From 8c0c95d1f6e8ff830ac5d7248ac1d167c7d21755 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 5 Oct 2019 16:06:16 -0700 Subject: [PATCH] Poetry updates update version and author emails update makefile to use poetry for more things remove faulty conditional --- Makefile | 6 +++--- jrnl/install.py | 2 +- pyproject.toml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6219c1e6..de491e1f 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ clean: rm -f *.html html: - mkdocs serve + poetry run mkdocs serve # Build GitHub Page from docs docs: - mkdocs gh-deploy + poetry run mkdocs gh-deploy format: ## check style with flake8 poetry run black features jrnl @@ -31,7 +31,7 @@ dist: clean ## builds source and wheel package release: dist ## package and upload a release poetry publish - mkdocs gh-deploy + poetry run mkdocs gh-deploy install: clean ## install the package to the active Python's site-packages poetry install diff --git a/jrnl/install.py b/jrnl/install.py index 77247508..5a80562f 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -65,7 +65,7 @@ def upgrade_config(config): This essentially automatically ports jrnl installations if new config parameters are introduced in later versions.""" missing_keys = set(default_config).difference(config) - if missing_keys or config['version'] != __version__: + if missing_keys: for key in missing_keys: config[key] = default_config[key] save_config(config) diff --git a/pyproject.toml b/pyproject.toml index 75df2256..7c2f123a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,11 @@ [tool.poetry] name = "jrnl" -version = "2.0.0" +version = "2.1" description = "Collect your thoughts and notes without leaving the command line." authors = [ "Manuel Ebert ", - "Jonathan Wren", - "Micah Ellison" + "Jonathan Wren ", + "Micah Ellison " ] license = "MIT" readme = "README.md"