diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2023-12-30 18:50:59 +0100 |
|---|---|---|
| committer |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-12-31 09:50:16 +0100 |
| commit | 4cc81cf53d0d952fe2c56929d4ef47ecfc7f4af2 (patch) | |
| tree | 6588cf931031a8ec2053e26ce9d5619e17cdb2f2 /dev-vcs | |
| parent | dev-python/wraps: remove unused patch (diff) | |
| download | sci-4cc81cf53d0d952fe2c56929d4ef47ecfc7f4af2.tar.gz sci-4cc81cf53d0d952fe2c56929d4ef47ecfc7f4af2.tar.bz2 sci-4cc81cf53d0d952fe2c56929d4ef47ecfc7f4af2.zip | |
dev-vcs/dandi-cli: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch | 46 | ||||
| -rw-r--r-- | dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch | 13 |
2 files changed, 0 insertions, 59 deletions
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch deleted file mode 100644 index 4d4715f95..000000000 --- a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a363b68b79b3dd2004912640c90958882a918537 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 4 May 2022 19:49:37 +0200 -Subject: [PATCH] Prepend to sys.path to fix versioneer in PEP517 mode - -Prepend the current directory to sys.path rather than appending it -in order to fix the build in PEP517 mode properly. If the path -is appended and versioneer is installed on the system, the system -versioneer.py (i.e. the module used to install versioneer into projects) -is imported rather than the local file, and the build fails: - -``` -Traceback (most recent call last): - File "/usr/lib/python-exec/python3.10/gpep517", line 4, in <module> - sys.exit(main()) - File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 136, in main - return func(args) - File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 44, in build_wheel - wheel_name = backend.build_wheel(args.wheel_dir, args.config_json) - File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 244, in build_wheel - return self._build_with_temp_dir(['bdist_wheel'], '.whl', - File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 229, in _build_with_temp_dir - self.run_setup() - File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 174, in run_setup - exec(compile(code, __file__, 'exec'), locals()) - File "setup.py", line 32, in <module> - "version": versioneer.get_version(), -AttributeError: module 'versioneer' has no attribute 'get_version' -``` ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index e8dddc985..05765009c 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,7 +23,7 @@ - # This is needed for versioneer to be importable when building with PEP 517. - # See <https://github.com/warner/python-versioneer/issues/193> and links - # therein for more information. --sys.path.append(os.path.dirname(__file__)) -+sys.path.insert(0, os.path.dirname(__file__)) - - try: - import versioneer diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch deleted file mode 100644 index bcc3853d3..000000000 --- a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pip-versioncheck.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/setup.cfg 2021-10-06 11:44:40.549337707 -0400 -+++ b/dsetup.cfg 2021-10-06 11:45:10.236935245 -0400 -@@ -30,8 +30,8 @@ - appdirs - click - click-didyoumean -- dandischema ~= 0.6.0 -- etelemetry >= 0.2.2 -+ dandischema -+ etelemetry - fasteners - fscacher - # Specifying != might be what causes pip 19.3.1 first to install hdmf 1.5.1 |