mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 13:08:31 +02:00
Merge pull request #833 from jrnl-org/master
Merge master back into Develop
This commit is contained in:
commit
dc4ce6a3bb
6 changed files with 21 additions and 15 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -52,4 +52,3 @@ exp/
|
|||
_extras/
|
||||
*.sublime-*
|
||||
site/
|
||||
jrnl/__version__.py
|
||||
|
|
|
@ -13,7 +13,7 @@ before_install:
|
|||
- date
|
||||
|
||||
install:
|
||||
- pip install poetry~=0.12.17
|
||||
- pip install poetry
|
||||
- poetry install
|
||||
- poetry run python --version
|
||||
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
- Updating/clarifying template explanation [\#829](https://github.com/jrnl-org/jrnl/pull/829) ([heymajor](https://github.com/heymajor))
|
||||
|
||||
# Changelog
|
||||
|
||||
## [Unreleased](https://github.com/jrnl-org/jrnl/)
|
||||
## [v2.2](https://pypi.org/project/jrnl/v2.2/) (2020-02-01)
|
||||
|
||||
[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.2-beta2...v2.2)
|
||||
|
||||
[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.1.1...HEAD)
|
||||
|
||||
**Implemented enhancements:**
|
||||
|
||||
|
@ -37,6 +37,8 @@
|
|||
|
||||
**Build:**
|
||||
|
||||
- Fix issue where jrnl would always out 'source' for version, fix Poetry config to build and publish properly [\#820](https://github.com/jrnl-org/jrnl/pull/820) ([wren](https://github.com/wren))
|
||||
- Unpin poetry [\#808](https://github.com/jrnl-org/jrnl/pull/808) ([wren](https://github.com/wren))
|
||||
- Fix all skipped tests on Travis Windows builds by preserving newlines [\#823](https://github.com/jrnl-org/jrnl/pull/823) ([micahellison](https://github.com/micahellison))
|
||||
- Change PyPI auth method in build pipeline [\#807](https://github.com/jrnl-org/jrnl/pull/807) ([wren](https://github.com/wren))
|
||||
- Automagically update the changelog you see before your very eyes! [\#806](https://github.com/jrnl-org/jrnl/pull/806) ([wren](https://github.com/wren))
|
||||
|
@ -50,6 +52,7 @@
|
|||
|
||||
**Updated documentation:**
|
||||
|
||||
- Explain how fish can be configured to exclude jrnl commands from history by default [\#809](https://github.com/jrnl-org/jrnl/pull/809) ([aureooms](https://github.com/aureooms))
|
||||
- Remove merge marker in recipes.md [\#782](https://github.com/jrnl-org/jrnl/pull/782) ([markphelps](https://github.com/markphelps))
|
||||
- Fix merge conflict left-over [\#767](https://github.com/jrnl-org/jrnl/pull/767) ([thejspr](https://github.com/thejspr))
|
||||
- Display header in docs on mobile devices [\#763](https://github.com/jrnl-org/jrnl/pull/763) ([maebert](https://github.com/maebert))
|
||||
|
|
|
@ -56,10 +56,14 @@ setopt HIST_IGNORE_SPACE
|
|||
alias jrnl=" jrnl"
|
||||
```
|
||||
|
||||
The fish shell does not support automatically preventing logging like
|
||||
this. To prevent `jrnl` commands being logged by fish, you must make
|
||||
sure to type a space before every `jrnl` command you enter. To delete
|
||||
existing `jrnl` commands from fish’s history, run
|
||||
If you are using `fish` instead of `bash` or `zsh`, you can get the same behaviour by
|
||||
adding this to your `fish` configuration:
|
||||
|
||||
``` sh
|
||||
abbr jrnl=" jrnl"
|
||||
```
|
||||
|
||||
To delete existing `jrnl` commands from `fish`’s history, run
|
||||
`history delete --prefix 'jrnl '`.
|
||||
|
||||
## Manual decryption
|
||||
|
|
1
jrnl/__version__.py
Normal file
1
jrnl/__version__.py
Normal file
|
@ -0,0 +1 @@
|
|||
__version__ = "v2.2-beta"
|
|
@ -1,12 +1,15 @@
|
|||
[tool.poetry]
|
||||
name = "jrnl"
|
||||
version = "v2.1.1"
|
||||
version = "v2.2.1-beta2"
|
||||
description = "Collect your thoughts and notes without leaving the command line."
|
||||
authors = [
|
||||
"Manuel Ebert <manuel@1450.me>",
|
||||
"Jonathan Wren <jonathan@nowandwren.com>",
|
||||
"Micah Ellison <micahellison@gmail.com>"
|
||||
]
|
||||
maintainers = [
|
||||
"Jonathan Wren and Micah Ellison <jrnl-sh@googlegroups.com>",
|
||||
]
|
||||
license = "MIT"
|
||||
readme = "README.md"
|
||||
homepage = "https://jrnl.sh"
|
||||
|
@ -30,12 +33,8 @@ pyyaml = "^5.1"
|
|||
behave = "^1.2"
|
||||
mkdocs = "^1.0"
|
||||
flake8 = "^3.7"
|
||||
black = {version = "^19.10b0",allows-prereleases = true}
|
||||
black = {version = "^19.10b0",allow-prereleases = true}
|
||||
|
||||
[tool.poetry.scripts]
|
||||
jrnl = 'jrnl.cli:run'
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry>=0.12"]
|
||||
build-backend = "poetry.masonry.api"
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue