CVS commit: pkgsrc/time/py-jrnl

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Jul 28 10:01:33 UTC 2024

Modified Files:
        pkgsrc/time/py-jrnl: Makefile PLIST distinfo
Removed Files:
        pkgsrc/time/py-jrnl/patches: patch-setup.py

Log Message:
py-jrnl: Update to 4.1

Changes:
## v4.1

- Add Python 3.12 support

## v4.0.1

- Bug fixes

## v4.0

- Drop Python 3.9 support
- Several improvements
- Bug fixes

## v3.3

- Change default config to use journal key
- Add machine readable --list output
- Bug fixes

## v3.2

- Suppress "Entry added" message if using default journal
- Add message showing the number of search results

## v3.1

- Add linewrap option 'auto'
- Bug fixes

## v3.0

- Drop support for Python 3.7 and 3.8
- Show name of journal when creating a password/encrypting
- Rework how all output and messaging works in jrnl
- Implement --change-time flag
- Bug fixes

## v2.8.4

- Add hash as a default tag symbol for new jrnl config file
- Add --config-file argument to use alternate config file at runtime
- Bug fixes

## v2.8.3

- Bug fixes

## v2.8.2

- Misc improvements

## v2.8.1

- Bug fixes

## v2.8

- Add `--config-override` feature
- Bug fixes

## v2.7.1

- Bug fixes

## v2.7

- Add new date format (`--format date`) for heatmapping
- Add new `-today-in-history`, `-month`, `-day`, and `-year` search filters
- Allow custom extensions when editing (for easier syntax highlighting)
- Bug fixes

## v2.6

- Add ability to put --edit partly through a cli entry to move it to the editor
- Allow --edit flag partway through an entry
- Bug fixes

## v2.5

- Deprecate Python 3.6
- Add support for Python 3.9
- Implement arg parsing library
- Rename `--export` to `--format` and `--export -o` to `--format --file`
- Pull functionality out of util.py
- Support -not for individual @tag in the command line
- Add punctuation more commonly used in Asian languages (ellipsis) to sentence parsing
- Clean up help screen, get rid of util.py
- Bug fixes

## v2.4.5

- Bug fixes

## v2.4.4

- Misc improvements and bug fixes

## v2.4.3

- Speed up jrnl by 10%, improve slow imports
- Bug fixes

## v2.4.2

- Bug fixes

## v2.4.1

- Bug fixes

## v2.4

- Misc improvements and bug fixes

## v2.2

- Full text search (case insensitive) with "-contains"
- Reduce startup time by 55%
- Refactor password logic to prevent accidental password leakage
- Password confirmation
- Bug fixes

## v2.1.1

- Support Python 3.6+
- Drop Python 2 support
- Bug fixes

## v2.1.post2

- Bug fixes

## v2.0.1

- Switch to hashmark Markdown headers on export (Mk II)
- Add '-not' flag for excluding tags from filter
- Handle KeyboardInterrupt when installing journal
- Bug fixes

## v2.0.0

- Change cryptographic backend from PyCrypto to cryptography.io
- Config now respects XDG conventions and may move accordingly
- Config name changed from `journals.jrnl_name.journal` to
  `journals.jrnl_name.path`
- Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/time/py-jrnl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/py-jrnl/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/py-jrnl/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/time/py-jrnl/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/py-jrnl/Makefile
diff -u pkgsrc/time/py-jrnl/Makefile:1.7 pkgsrc/time/py-jrnl/Makefile:1.8
--- pkgsrc/time/py-jrnl/Makefile:1.7    Mon Oct 23 06:37:55 2023
+++ pkgsrc/time/py-jrnl/Makefile        Sun Jul 28 10:01:33 2024
@@ -1,29 +1,28 @@
-# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/07/28 10:01:33 leot Exp $
 
-DISTNAME=      jrnl-1.9.8
+DISTNAME=      jrnl-4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   4
 CATEGORIES=    time python
-GITHUB_PROJECT=        jrnl
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=maebert/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jrnl/}
 
 MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      https://jrnl.sh/
 COMMENT=       Command line journal application
-LICENSE=       mit
+LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
-DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.2:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-keyring>=3.3:../../security/py-keyring
-DEPENDS+=      ${PYPKGPREFIX}-keyrings.alt>=1.3:../../security/py-keyrings.alt
-DEPENDS+=      ${PYPKGPREFIX}-parsedatetime>=1.2:../../time/py-parsedatetime
-DEPENDS+=      ${PYPKGPREFIX}-pytz>=2013b:../../time/py-pytz
-DEPENDS+=      ${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six
-DEPENDS+=      ${PYPKGPREFIX}-tzlocal>=1.1:../../time/py-tzlocal
+DEPENDS+=      ${PYPKGPREFIX}-colorama>=0.4.0:../../comms/py-colorama
+DEPENDS+=      ${PYPKGPREFIX}-cryptography>=3.0:../../security/py-cryptography
+DEPENDS+=      ${PYPKGPREFIX}-dateutil>=2.8:../../time/py-dateutil
+DEPENDS+=      ${PYPKGPREFIX}-keyring>=21.0:../../security/py-keyring
+DEPENDS+=      ${PYPKGPREFIX}-parsedatetime>=2.6:../../time/py-parsedatetime
+DEPENDS+=      ${PYPKGPREFIX}-rich>=12.2.0:../../comms/py-rich
+DEPENDS+=      ${PYPKGPREFIX}-ruamel-yaml>=0.17.22:../../devel/py-ruamel-yaml
+DEPENDS+=      ${PYPKGPREFIX}-tzlocal>=4.0:../../time/py-tzlocal
+DEPENDS+=      ${PYPKGPREFIX}-xdg>=0.27.0:../../devel/py-xdg
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27      # py-keyring
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38 39        # Python 3.10 or newer
 
 USE_PKG_RESOURCES=     yes
 
@@ -31,5 +30,5 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/jrnl ${DESTDIR}${PREFIX}/bin/jrnl-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/py-jrnl/PLIST
diff -u pkgsrc/time/py-jrnl/PLIST:1.1 pkgsrc/time/py-jrnl/PLIST:1.2
--- pkgsrc/time/py-jrnl/PLIST:1.1       Tue Dec 19 14:26:21 2017
+++ pkgsrc/time/py-jrnl/PLIST   Sun Jul 28 10:01:33 2024
@@ -1,35 +1,149 @@
-@comment $NetBSD: PLIST,v 1.1 2017/12/19 14:26:21 leot Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/07/28 10:01:33 leot Exp $
 bin/jrnl-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/jrnl/DayOneJournal.py
-${PYSITELIB}/jrnl/DayOneJournal.pyc
-${PYSITELIB}/jrnl/DayOneJournal.pyo
-${PYSITELIB}/jrnl/Entry.py
-${PYSITELIB}/jrnl/Entry.pyc
-${PYSITELIB}/jrnl/Entry.pyo
-${PYSITELIB}/jrnl/Journal.py
-${PYSITELIB}/jrnl/Journal.pyc
-${PYSITELIB}/jrnl/Journal.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.md
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
 ${PYSITELIB}/jrnl/__init__.py
 ${PYSITELIB}/jrnl/__init__.pyc
 ${PYSITELIB}/jrnl/__init__.pyo
-${PYSITELIB}/jrnl/cli.py
-${PYSITELIB}/jrnl/cli.pyc
-${PYSITELIB}/jrnl/cli.pyo
-${PYSITELIB}/jrnl/exporters.py
-${PYSITELIB}/jrnl/exporters.pyc
-${PYSITELIB}/jrnl/exporters.pyo
+${PYSITELIB}/jrnl/__main__.py
+${PYSITELIB}/jrnl/__main__.pyc
+${PYSITELIB}/jrnl/__main__.pyo
+${PYSITELIB}/jrnl/__version__.py
+${PYSITELIB}/jrnl/__version__.pyc
+${PYSITELIB}/jrnl/__version__.pyo
+${PYSITELIB}/jrnl/args.py
+${PYSITELIB}/jrnl/args.pyc
+${PYSITELIB}/jrnl/args.pyo
+${PYSITELIB}/jrnl/color.py
+${PYSITELIB}/jrnl/color.pyc
+${PYSITELIB}/jrnl/color.pyo
+${PYSITELIB}/jrnl/commands.py
+${PYSITELIB}/jrnl/commands.pyc
+${PYSITELIB}/jrnl/commands.pyo
+${PYSITELIB}/jrnl/config.py
+${PYSITELIB}/jrnl/config.pyc
+${PYSITELIB}/jrnl/config.pyo
+${PYSITELIB}/jrnl/controller.py
+${PYSITELIB}/jrnl/controller.pyc
+${PYSITELIB}/jrnl/controller.pyo
+${PYSITELIB}/jrnl/editor.py
+${PYSITELIB}/jrnl/editor.pyc
+${PYSITELIB}/jrnl/editor.pyo
+${PYSITELIB}/jrnl/encryption/BaseEncryption.py
+${PYSITELIB}/jrnl/encryption/BaseEncryption.pyc
+${PYSITELIB}/jrnl/encryption/BaseEncryption.pyo
+${PYSITELIB}/jrnl/encryption/BaseKeyEncryption.py
+${PYSITELIB}/jrnl/encryption/BaseKeyEncryption.pyc
+${PYSITELIB}/jrnl/encryption/BaseKeyEncryption.pyo
+${PYSITELIB}/jrnl/encryption/BasePasswordEncryption.py
+${PYSITELIB}/jrnl/encryption/BasePasswordEncryption.pyc
+${PYSITELIB}/jrnl/encryption/BasePasswordEncryption.pyo
+${PYSITELIB}/jrnl/encryption/Jrnlv1Encryption.py
+${PYSITELIB}/jrnl/encryption/Jrnlv1Encryption.pyc
+${PYSITELIB}/jrnl/encryption/Jrnlv1Encryption.pyo
+${PYSITELIB}/jrnl/encryption/Jrnlv2Encryption.py
+${PYSITELIB}/jrnl/encryption/Jrnlv2Encryption.pyc
+${PYSITELIB}/jrnl/encryption/Jrnlv2Encryption.pyo
+${PYSITELIB}/jrnl/encryption/NoEncryption.py
+${PYSITELIB}/jrnl/encryption/NoEncryption.pyc
+${PYSITELIB}/jrnl/encryption/NoEncryption.pyo
+${PYSITELIB}/jrnl/encryption/__init__.py
+${PYSITELIB}/jrnl/encryption/__init__.pyc
+${PYSITELIB}/jrnl/encryption/__init__.pyo
+${PYSITELIB}/jrnl/exception.py
+${PYSITELIB}/jrnl/exception.pyc
+${PYSITELIB}/jrnl/exception.pyo
 ${PYSITELIB}/jrnl/install.py
 ${PYSITELIB}/jrnl/install.pyc
 ${PYSITELIB}/jrnl/install.pyo
+${PYSITELIB}/jrnl/journals/DayOneJournal.py
+${PYSITELIB}/jrnl/journals/DayOneJournal.pyc
+${PYSITELIB}/jrnl/journals/DayOneJournal.pyo
+${PYSITELIB}/jrnl/journals/Entry.py
+${PYSITELIB}/jrnl/journals/Entry.pyc
+${PYSITELIB}/jrnl/journals/Entry.pyo
+${PYSITELIB}/jrnl/journals/FolderJournal.py
+${PYSITELIB}/jrnl/journals/FolderJournal.pyc
+${PYSITELIB}/jrnl/journals/FolderJournal.pyo
+${PYSITELIB}/jrnl/journals/Journal.py
+${PYSITELIB}/jrnl/journals/Journal.pyc
+${PYSITELIB}/jrnl/journals/Journal.pyo
+${PYSITELIB}/jrnl/journals/__init__.py
+${PYSITELIB}/jrnl/journals/__init__.pyc
+${PYSITELIB}/jrnl/journals/__init__.pyo
+${PYSITELIB}/jrnl/keyring.py
+${PYSITELIB}/jrnl/keyring.pyc
+${PYSITELIB}/jrnl/keyring.pyo
+${PYSITELIB}/jrnl/main.py
+${PYSITELIB}/jrnl/main.pyc
+${PYSITELIB}/jrnl/main.pyo
+${PYSITELIB}/jrnl/messages/Message.py
+${PYSITELIB}/jrnl/messages/Message.pyc
+${PYSITELIB}/jrnl/messages/Message.pyo
+${PYSITELIB}/jrnl/messages/MsgStyle.py
+${PYSITELIB}/jrnl/messages/MsgStyle.pyc
+${PYSITELIB}/jrnl/messages/MsgStyle.pyo
+${PYSITELIB}/jrnl/messages/MsgText.py
+${PYSITELIB}/jrnl/messages/MsgText.pyc
+${PYSITELIB}/jrnl/messages/MsgText.pyo
+${PYSITELIB}/jrnl/messages/__init__.py
+${PYSITELIB}/jrnl/messages/__init__.pyc
+${PYSITELIB}/jrnl/messages/__init__.pyo
+${PYSITELIB}/jrnl/os_compat.py
+${PYSITELIB}/jrnl/os_compat.pyc
+${PYSITELIB}/jrnl/os_compat.pyo
+${PYSITELIB}/jrnl/output.py
+${PYSITELIB}/jrnl/output.pyc
+${PYSITELIB}/jrnl/output.pyo
+${PYSITELIB}/jrnl/override.py
+${PYSITELIB}/jrnl/override.pyc
+${PYSITELIB}/jrnl/override.pyo
+${PYSITELIB}/jrnl/path.py
+${PYSITELIB}/jrnl/path.pyc
+${PYSITELIB}/jrnl/path.pyo
+${PYSITELIB}/jrnl/plugins/__init__.py
+${PYSITELIB}/jrnl/plugins/__init__.pyc
+${PYSITELIB}/jrnl/plugins/__init__.pyo
+${PYSITELIB}/jrnl/plugins/dates_exporter.py
+${PYSITELIB}/jrnl/plugins/dates_exporter.pyc
+${PYSITELIB}/jrnl/plugins/dates_exporter.pyo
+${PYSITELIB}/jrnl/plugins/fancy_exporter.py
+${PYSITELIB}/jrnl/plugins/fancy_exporter.pyc
+${PYSITELIB}/jrnl/plugins/fancy_exporter.pyo
+${PYSITELIB}/jrnl/plugins/jrnl_importer.py
+${PYSITELIB}/jrnl/plugins/jrnl_importer.pyc
+${PYSITELIB}/jrnl/plugins/jrnl_importer.pyo
+${PYSITELIB}/jrnl/plugins/json_exporter.py
+${PYSITELIB}/jrnl/plugins/json_exporter.pyc
+${PYSITELIB}/jrnl/plugins/json_exporter.pyo
+${PYSITELIB}/jrnl/plugins/markdown_exporter.py
+${PYSITELIB}/jrnl/plugins/markdown_exporter.pyc
+${PYSITELIB}/jrnl/plugins/markdown_exporter.pyo
+${PYSITELIB}/jrnl/plugins/tag_exporter.py
+${PYSITELIB}/jrnl/plugins/tag_exporter.pyc
+${PYSITELIB}/jrnl/plugins/tag_exporter.pyo
+${PYSITELIB}/jrnl/plugins/text_exporter.py
+${PYSITELIB}/jrnl/plugins/text_exporter.pyc
+${PYSITELIB}/jrnl/plugins/text_exporter.pyo
+${PYSITELIB}/jrnl/plugins/util.py
+${PYSITELIB}/jrnl/plugins/util.pyc
+${PYSITELIB}/jrnl/plugins/util.pyo
+${PYSITELIB}/jrnl/plugins/xml_exporter.py
+${PYSITELIB}/jrnl/plugins/xml_exporter.pyc
+${PYSITELIB}/jrnl/plugins/xml_exporter.pyo
+${PYSITELIB}/jrnl/plugins/yaml_exporter.py
+${PYSITELIB}/jrnl/plugins/yaml_exporter.pyc
+${PYSITELIB}/jrnl/plugins/yaml_exporter.pyo
+${PYSITELIB}/jrnl/prompt.py
+${PYSITELIB}/jrnl/prompt.pyc
+${PYSITELIB}/jrnl/prompt.pyo
+${PYSITELIB}/jrnl/templates/sample.template
 ${PYSITELIB}/jrnl/time.py
 ${PYSITELIB}/jrnl/time.pyc
 ${PYSITELIB}/jrnl/time.pyo
-${PYSITELIB}/jrnl/util.py
-${PYSITELIB}/jrnl/util.pyc
-${PYSITELIB}/jrnl/util.pyo
+${PYSITELIB}/jrnl/upgrade.py
+${PYSITELIB}/jrnl/upgrade.pyc
+${PYSITELIB}/jrnl/upgrade.pyo

Index: pkgsrc/time/py-jrnl/distinfo
diff -u pkgsrc/time/py-jrnl/distinfo:1.3 pkgsrc/time/py-jrnl/distinfo:1.4
--- pkgsrc/time/py-jrnl/distinfo:1.3    Tue Oct 26 11:24:33 2021
+++ pkgsrc/time/py-jrnl/distinfo        Sun Jul 28 10:01:33 2024
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:24:33 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/07/28 10:01:33 leot Exp $
 
-BLAKE2s (jrnl-1.9.8.tar.gz) = d3481395df1b9e1895a7a1871580dd096a7e14f305d7a4cf2108efb4f17fe53e
-SHA512 (jrnl-1.9.8.tar.gz) = dad2e78a984c2415674e26e833dac118bc99acbd43b860dbf39a19a0374c92393b91087f0d1b3163ad0cf851c7abfebe80ce74320d6058f8a494a84bc51d0aef
-Size (jrnl-1.9.8.tar.gz) = 193595 bytes
-SHA1 (patch-setup.py) = 41ccaebed6a5bf3aca3a94eec376e6de830e0f32
+BLAKE2s (jrnl-4.1.tar.gz) = a33e59928da3600bf708c09d3959672728942afe8ad362a5588b7b1dcc9e8229
+SHA512 (jrnl-4.1.tar.gz) = 4f3c074340144fd35f6e15100c4f233e5662f547e143bff7ea49fc8cfa33f480439f892436f231f4f576f181249c5a717e6c14810fec8be35f5ee4db24df43b8
+Size (jrnl-4.1.tar.gz) = 59126 bytes