pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-setuptools_scm py-setuptools_scm: fix typo in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2e120a4f1fa
branches:  trunk
changeset: 371764:c2e120a4f1fa
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 13 21:50:27 2022 +0000

description:
py-setuptools_scm: fix typo in DEPENDS

Remove unnecessary patches.

Bump PKGREVISION.

diffstat:

 devel/py-setuptools_scm/Makefile                |   6 +++---
 devel/py-setuptools_scm/distinfo                |   4 +---
 devel/py-setuptools_scm/patches/patch-setup.cfg |  23 -----------------------
 devel/py-setuptools_scm/patches/patch-setup.py  |  15 ---------------
 4 files changed, 4 insertions(+), 44 deletions(-)

diffs (81 lines):

diff -r 4f27bbe467c2 -r c2e120a4f1fa devel/py-setuptools_scm/Makefile
--- a/devel/py-setuptools_scm/Makefile  Thu Jan 13 21:30:00 2022 +0000
+++ b/devel/py-setuptools_scm/Makefile  Thu Jan 13 21:50:27 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2022/01/13 21:03:51 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/13 21:50:27 wiz Exp $
 
 DISTNAME=      setuptools_scm-6.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/setuptools_scm/}
 
@@ -12,7 +12,7 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../textproc/py-tomli
+DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
diff -r 4f27bbe467c2 -r c2e120a4f1fa devel/py-setuptools_scm/distinfo
--- a/devel/py-setuptools_scm/distinfo  Thu Jan 13 21:30:00 2022 +0000
+++ b/devel/py-setuptools_scm/distinfo  Thu Jan 13 21:50:27 2022 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.28 2022/01/13 21:03:51 wiz Exp $
+$NetBSD: distinfo,v 1.29 2022/01/13 21:50:27 wiz Exp $
 
 BLAKE2s (setuptools_scm-6.3.2.tar.gz) = cf03d6b556f099ce05fea58e433c9b245efa33e17673af18ab2607623da77cce
 SHA512 (setuptools_scm-6.3.2.tar.gz) = 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0
 Size (setuptools_scm-6.3.2.tar.gz) = 57207 bytes
-SHA1 (patch-setup.cfg) = fdedda5274adb912a731e8e56508621dbfa1aa0e
-SHA1 (patch-setup.py) = 4a24bde6a0338aa95dd25b54362b01c9370770b8
diff -r 4f27bbe467c2 -r c2e120a4f1fa devel/py-setuptools_scm/patches/patch-setup.cfg
--- a/devel/py-setuptools_scm/patches/patch-setup.cfg   Thu Jan 13 21:30:00 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-setup.cfg,v 1.1 2022/01/13 21:03:51 wiz Exp $
-
-Do not put tomli dependency in requires.txt.
-tomli is not found by setuptools, since it's a wheel, not an egg.
-
---- setup.cfg.orig     2021-09-11 19:26:31.656693700 +0000
-+++ setup.cfg
-@@ -29,7 +29,6 @@ packages = find:
- install_requires = 
-       packaging>=20.0
-       setuptools
--      tomli>=1.0.0 # keep in sync
- python_requires = >=3.6
- package_dir = 
-       =src
-@@ -72,7 +71,6 @@ setuptools_scm.version_scheme = 
- [options.extras_require]
- toml = 
-       setuptools>=42
--      tomli>=1.0.0
- 
- [egg_info]
- tag_build = 
diff -r 4f27bbe467c2 -r c2e120a4f1fa devel/py-setuptools_scm/patches/patch-setup.py
--- a/devel/py-setuptools_scm/patches/patch-setup.py    Thu Jan 13 21:30:00 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2022/01/13 21:03:51 wiz Exp $
-
-Do not put tomli dependency in requires.txt.
-tomli is not found by setuptools, since it's a wheel, not an egg.
-
---- setup.py.orig      2021-09-11 19:26:20.000000000 +0000
-+++ setup.py
-@@ -61,7 +61,6 @@ if __name__ == "__main__":
-         extras_require={
-             "toml": [
-                 "setuptools>=42",
--                "tomli>=1.0.0",
-             ],
-         },
-         cmdclass={"bdist_egg": bdist_egg},



Home | Main Index | Thread Index | Old Index