CVS commit: pkgsrc/devel/py-setuptools_scm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 13 21:03:52 UTC 2022

Modified Files:
        pkgsrc/devel/py-setuptools_scm: Makefile distinfo
Added Files:
        pkgsrc/devel/py-setuptools_scm/patches: patch-setup.cfg patch-setup.py

Log Message:
py-setuptools_scm: remove tomli from requires.txt

tomli is not found by setuptools, since it's a wheel, not an egg.
I don't know how this is supposed to work.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/py-setuptools_scm/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-setuptools_scm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-setuptools_scm/patches/patch-setup.cfg \
    pkgsrc/devel/py-setuptools_scm/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/devel/py-setuptools_scm/Makefile
diff -u pkgsrc/devel/py-setuptools_scm/Makefile:1.28 pkgsrc/devel/py-setuptools_scm/Makefile:1.29
--- pkgsrc/devel/py-setuptools_scm/Makefile:1.28        Thu Jan 13 19:37:29 2022
+++ pkgsrc/devel/py-setuptools_scm/Makefile     Thu Jan 13 21:03:51 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/13 19:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/13 21:03:51 wiz Exp $
 
 DISTNAME=      setuptools_scm-6.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/setuptools_scm/}
 

Index: pkgsrc/devel/py-setuptools_scm/distinfo
diff -u pkgsrc/devel/py-setuptools_scm/distinfo:1.27 pkgsrc/devel/py-setuptools_scm/distinfo:1.28
--- pkgsrc/devel/py-setuptools_scm/distinfo:1.27        Thu Jan 13 19:37:29 2022
+++ pkgsrc/devel/py-setuptools_scm/distinfo     Thu Jan 13 21:03:51 2022
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.27 2022/01/13 19:37:29 wiz Exp $
+$NetBSD: distinfo,v 1.28 2022/01/13 21:03:51 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

Added files:

Index: pkgsrc/devel/py-setuptools_scm/patches/patch-setup.cfg
diff -u /dev/null pkgsrc/devel/py-setuptools_scm/patches/patch-setup.cfg:1.1
--- /dev/null   Thu Jan 13 21:03:52 2022
+++ pkgsrc/devel/py-setuptools_scm/patches/patch-setup.cfg      Thu Jan 13 21:03:51 2022
@@ -0,0 +1,23 @@
+$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 = 
Index: pkgsrc/devel/py-setuptools_scm/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-setuptools_scm/patches/patch-setup.py:1.1
--- /dev/null   Thu Jan 13 21:03:52 2022
+++ pkgsrc/devel/py-setuptools_scm/patches/patch-setup.py       Thu Jan 13 21:03:51 2022
@@ -0,0 +1,15 @@
+$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},