Merge pull request #820 from wren/version-fix

Fix issue where jrnl would always out 'source' for version, fix Poetry config to build and publish properly
This commit is contained in:
Jonathan Wren 2020-01-25 13:44:13 -08:00 committed by GitHub
commit b71f8fc430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

1
.gitignore vendored
View file

@ -52,4 +52,3 @@ exp/
_extras/ _extras/
*.sublime-* *.sublime-*
site/ site/
jrnl/__version__.py

1
jrnl/__version__.py Normal file
View file

@ -0,0 +1 @@
__version__ = "v2.2-beta"

View file

@ -1,12 +1,15 @@
[tool.poetry] [tool.poetry]
name = "jrnl" name = "jrnl"
version = "v2.1.1" version = "v2.2-beta"
description = "Collect your thoughts and notes without leaving the command line." description = "Collect your thoughts and notes without leaving the command line."
authors = [ authors = [
"Manuel Ebert <manuel@1450.me>", "Manuel Ebert <manuel@1450.me>",
"Jonathan Wren <jonathan@nowandwren.com>", "Jonathan Wren <jonathan@nowandwren.com>",
"Micah Ellison <micahellison@gmail.com>" "Micah Ellison <micahellison@gmail.com>"
] ]
maintainers = [
"Jonathan Wren and Micah Ellison <jrnl-sh@googlegroups.com>",
]
license = "MIT" license = "MIT"
readme = "README.md" readme = "README.md"
homepage = "https://jrnl.sh" homepage = "https://jrnl.sh"
@ -30,7 +33,7 @@ pyyaml = "^5.1"
behave = "^1.2" behave = "^1.2"
mkdocs = "^1.0" mkdocs = "^1.0"
flake8 = "^3.7" flake8 = "^3.7"
black = {version = "^19.10b0",allows-prereleases = true} black = {version = "^19.10b0",allow-prereleases = true}
[tool.poetry.scripts] [tool.poetry.scripts]
jrnl = 'jrnl.cli:run' jrnl = 'jrnl.cli:run'