mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/pefile: remove dependency to dev-python/future
Closes: https://bugs.gentoo.org/888279 Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/28825 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
ec5c2e8dd1
commit
34d649fc4f
115
dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
Normal file
115
dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
Normal file
@@ -0,0 +1,115 @@
|
||||
Bug: https://bugs.gentoo.org/888279
|
||||
|
||||
From 36bf63f1185b8407ff9b4ce8c1c8e8620d8ae30f Mon Sep 17 00:00:00 2001
|
||||
From: Letu Ren <fantasquex@gmail.com>
|
||||
Date: Sun, 26 Jun 2022 22:54:27 +0800
|
||||
Subject: [PATCH] Remove future from dependencies
|
||||
|
||||
Fix: #348
|
||||
---
|
||||
ordlookup/__init__.py | 15 ++-------------
|
||||
peutils.py | 7 -------
|
||||
setup.py | 19 ++++---------------
|
||||
tests/pefile_test.py | 3 ---
|
||||
4 files changed, 6 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/ordlookup/__init__.py b/ordlookup/__init__.py
|
||||
index c69aee0..8841d74 100644
|
||||
--- a/ordlookup/__init__.py
|
||||
+++ b/ordlookup/__init__.py
|
||||
@@ -1,5 +1,3 @@
|
||||
-from __future__ import absolute_import
|
||||
-import sys
|
||||
from . import ws2_32
|
||||
from . import oleaut32
|
||||
|
||||
@@ -15,18 +13,9 @@
|
||||
b"oleaut32.dll": oleaut32.ord_names,
|
||||
}
|
||||
|
||||
-PY3 = sys.version_info > (3,)
|
||||
|
||||
-if PY3:
|
||||
-
|
||||
- def formatOrdString(ord_val):
|
||||
- return "ord{}".format(ord_val).encode()
|
||||
-
|
||||
-
|
||||
-else:
|
||||
-
|
||||
- def formatOrdString(ord_val):
|
||||
- return b"ord%d" % ord_val
|
||||
+def formatOrdString(ord_val):
|
||||
+ return "ord{}".format(ord_val).encode()
|
||||
|
||||
|
||||
def ordLookup(libname, ord_val, make_name=False):
|
||||
diff --git a/peutils.py b/peutils.py
|
||||
index 34b98f5..4d4b2bd 100644
|
||||
--- a/peutils.py
|
||||
+++ b/peutils.py
|
||||
@@ -6,13 +6,6 @@
|
||||
|
||||
All rights reserved.
|
||||
"""
|
||||
-from __future__ import division
|
||||
-from future import standard_library
|
||||
-
|
||||
-standard_library.install_aliases()
|
||||
-from builtins import range
|
||||
-from builtins import object
|
||||
-
|
||||
import os
|
||||
import re
|
||||
import string
|
||||
diff --git a/setup.py b/setup.py
|
||||
index c8ab89f..206db6f 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -5,8 +5,6 @@
|
||||
import re
|
||||
import sys
|
||||
|
||||
-if sys.version_info.major == 3:
|
||||
- from io import open
|
||||
|
||||
try:
|
||||
from setuptools import setup, Command
|
||||
@@ -25,12 +23,8 @@ def _read_doc():
|
||||
Parse docstring from file 'pefile.py' and avoid importing
|
||||
this module directly.
|
||||
"""
|
||||
- if sys.version_info.major == 2:
|
||||
- with open('pefile.py', 'r') as f:
|
||||
- tree = ast.parse(f.read())
|
||||
- else:
|
||||
- with open('pefile.py', 'r', encoding='utf-8') as f:
|
||||
- tree = ast.parse(f.read())
|
||||
+ with open('pefile.py', 'r', encoding='utf-8') as f:
|
||||
+ tree = ast.parse(f.read())
|
||||
return ast.get_docstring(tree)
|
||||
|
||||
|
||||
@@ -42,12 +36,8 @@ def _read_attr(attr_name):
|
||||
__version__, __author__, __contact__,
|
||||
"""
|
||||
regex = attr_name + r"\s+=\s+['\"](.+)['\"]"
|
||||
- if sys.version_info.major == 2:
|
||||
- with open('pefile.py', 'r') as f:
|
||||
- match = re.search(regex, f.read())
|
||||
- else:
|
||||
- with open('pefile.py', 'r', encoding='utf-8') as f:
|
||||
- match = re.search(regex, f.read())
|
||||
+ with open('pefile.py', 'r', encoding='utf-8') as f:
|
||||
+ match = re.search(regex, f.read())
|
||||
# Second item in the group is the value of attribute.
|
||||
return match.group(1)
|
||||
|
||||
@@ -89,7 +79,6 @@ def run(self):
|
||||
python_requires=">=3.6.0",
|
||||
packages = ['ordlookup'],
|
||||
install_requires=[
|
||||
- 'future',
|
||||
],
|
||||
license="MIT",
|
||||
)
|
||||
30
dev-python/pefile/pefile-2022.5.30-r1.ebuild
Normal file
30
dev-python/pefile/pefile-2022.5.30-r1.ebuild
Normal file
@@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Module to read and work with Portable Executable (PE) files"
|
||||
HOMEPAGE="https://github.com/erocarrera/pefile"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-remove-future.patch"
|
||||
)
|
||||
|
||||
# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
|
||||
# suite inside the release files. The test fixtures in the source repo is
|
||||
# encrypted so that only their CI pipeline is able to run the tests.
|
||||
@@ -4,7 +4,7 @@
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_COMPAT=( python3_{8..11} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Module to read and work with Portable Executable (PE) files"
|
||||
@@ -21,9 +21,6 @@ fi
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-python/future[${PYTHON_USEDEP}]"
|
||||
|
||||
# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
|
||||
# suite inside the release files. The test fixtures in the source repo is
|
||||
# encrypted so that only their CI pipeline is able to run the tests.
|
||||
|
||||
Reference in New Issue
Block a user