fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pretty-print-entries

Browse source
This commit is contained in:
Aaron Lichtman 2019-11-12 22:49:11 +01:00 • committed by GitHub
commit 6ad5188315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -1,6 +1,8 @@
dist: xenial # required for Python >= 3.7 dist: xenial # required for Python >= 3.7
language: python language: python
python: "3.7" python:
- 3.6
- 3.7
git: git:
depth: false depth: false
before_install: before_install:

4
poetry.lock generated
View file

@ -381,8 +381,8 @@ version = "1.5.1"
pytz = "*" pytz = "*"
[metadata] [metadata]
content-hash = "22be2bc81609baae93ffdee9d5cb4d455d9cae13f56cf10eacc36258a1ea510a" content-hash = "9896cf59c7552b6ad95219ee5555c7445a3fab39c2e4f4c6f3d991a36635e44b"
python-versions = "^3.7" python-versions = ">=3.6.0, <3.8.0"
[metadata.hashes] [metadata.hashes]
ansiwrap = ["7b053567c88e1ad9eed030d3ac41b722125e4c1271c8a99ade797faff1f49fb1", "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"] ansiwrap = ["7b053567c88e1ad9eed030d3ac41b722125e4c1271c8a99ade797faff1f49fb1", "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"]

2
pyproject.toml
View file

@ -13,7 +13,7 @@ homepage = "https://jrnl.sh"
repository = "https://github.com/jrnl-org/jrnl" repository = "https://github.com/jrnl-org/jrnl"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.7" python = ">=3.6.0, <3.8.0"
pyxdg = "^0.26.0" pyxdg = "^0.26.0"
cryptography = "^2.7" cryptography = "^2.7"
passlib = "^1.7" passlib = "^1.7"