aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/keyrings_alt/Manifest1
-rw-r--r--dev-python/keyrings_alt/files/keyrings_alt-4.1.0-pycryptodome.patch90
-rw-r--r--dev-python/keyrings_alt/keyrings_alt-4.1.0-r1.ebuild31
-rw-r--r--dev-python/keyrings_alt/metadata.xml24
-rw-r--r--dev-python/nwbinspector/Manifest1
-rw-r--r--dev-python/nwbinspector/nwbinspector-0.4.12.ebuild38
6 files changed, 39 insertions, 146 deletions
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
deleted file mode 100644
index ec1eff845..000000000
--- a/dev-python/keyrings_alt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST keyrings.alt-4.1.0.tar.gz 28581 BLAKE2B bb4c8c5faa130c4cfb377985ee8692bcce802f0e03d1121281a8d73ac1c4ced4c6f913e6ab9ff39b1b7d37ff41b37905910d3a02e91fa4160fbe109aa16c2ae0 SHA512 6c2a7637bc73971081b95851898dcc2fafe5fd155333cee7032983b16f668d8db941c972747c7c4a2e20b4d6a5fe52d8ad96448f8ae7d372cd1c32e2a0d344f9
diff --git a/dev-python/keyrings_alt/files/keyrings_alt-4.1.0-pycryptodome.patch b/dev-python/keyrings_alt/files/keyrings_alt-4.1.0-pycryptodome.patch
deleted file mode 100644
index e0ca3a012..000000000
--- a/dev-python/keyrings_alt/files/keyrings_alt-4.1.0-pycryptodome.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/keyrings/alt/file.py b/keyrings/alt/file.py
-index 37c837f..866e8d0 100644
---- a/keyrings/alt/file.py
-+++ b/keyrings/alt/file.py
-@@ -44,8 +44,12 @@ class Encrypted:
- """
- Create the cipher object to encrypt or decrypt a payload.
- """
-- from Cryptodome.Protocol.KDF import PBKDF2
-- from Cryptodome.Cipher import AES
-+ try:
-+ from Cryptodome.Protocol.KDF import PBKDF2
-+ from Cryptodome.Cipher import AES
-+ except ImportError:
-+ from Crypto.Protocol.KDF import PBKDF2
-+ from Crypto.Cipher import AES
-
- pw = PBKDF2(password, salt, dkLen=self.block_size)
- return AES.new(pw[: self.block_size], AES.MODE_CFB, IV)
-@@ -79,7 +83,12 @@ class EncryptedKeyring(Encrypted, Keyring):
- __import__('Cryptodome.Protocol.KDF')
- __import__('Cryptodome.Random')
- except ImportError: # pragma: no cover
-- raise RuntimeError("pycryptodomex required")
-+ try:
-+ __import__('Crypto.Cipher.AES')
-+ __import__('Crypto.Protocol.KDF')
-+ __import__('Crypto.Random')
-+ except ImportError:
-+ raise RuntimeError("pycryptodomex or pycryptodome required")
- if not json: # pragma: no cover
- raise RuntimeError("JSON implementation such as simplejson required.")
- return 0.6
-@@ -190,10 +199,16 @@ class EncryptedKeyring(Encrypted, Keyring):
-
- def encrypt(self, password, assoc=None):
- # encrypt password, ignore associated data
-- from Cryptodome.Random import get_random_bytes
-+ try:
-+ from Cryptodome.Random import get_random_bytes
-+ except ImportError:
-+ from Crypto.Random import get_random_bytes
-
- salt = get_random_bytes(self.block_size)
-- from Cryptodome.Cipher import AES
-+ try:
-+ from Cryptodome.Cipher import AES
-+ except ImportError:
-+ from Crypto.Cipher import AES
-
- IV = get_random_bytes(AES.block_size)
- cipher = self._create_cipher(self.keyring_key, salt, IV)
-diff --git a/tests/test_crypto.py b/tests/test_crypto.py
-index cfc782a..7396023 100644
---- a/tests/test_crypto.py
-+++ b/tests/test_crypto.py
-@@ -14,7 +14,12 @@ def is_crypto_supported():
- __import__('Cryptodome.Protocol.KDF')
- __import__('Cryptodome.Random')
- except ImportError:
-- return False
-+ try:
-+ __import__('Crypto.Cipher.AES')
-+ __import__('Crypto.Protocol.KDF')
-+ __import__('Crypto.Random')
-+ except ImportError:
-+ return False
- return True
-
-
-diff --git a/tests/test_file.py b/tests/test_file.py
-index 62192da..3f813f0 100644
---- a/tests/test_file.py
-+++ b/tests/test_file.py
-@@ -157,7 +157,14 @@ class FileKeyringTests(BackendBasicTests):
- class TestEncryptedFileKeyring(FileKeyringTests):
- @pytest.fixture(autouse=True)
- def crypt_fixture(self, monkeypatch):
-- pytest.importorskip('Cryptodome')
-+ try:
-+ import Cryptodome
-+ except ImportError:
-+ try:
-+ import Crypto
-+ except ImportError:
-+ pytest.skip("Neither pycryptodome nor pycryptodomex are available",
-+ allow_module_level=True)
- fake_getpass = mock.Mock(return_value='abcdef')
- monkeypatch.setattr(getpass, 'getpass', fake_getpass)
-
diff --git a/dev-python/keyrings_alt/keyrings_alt-4.1.0-r1.ebuild b/dev-python/keyrings_alt/keyrings_alt-4.1.0-r1.ebuild
deleted file mode 100644
index 290c2f434..000000000
--- a/dev-python/keyrings_alt/keyrings_alt-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="keyrings.alt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Alternate keyring backend implementations used with dev-python/keyring"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
-
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-# Patch sumbitted upstream:
-# https://github.com/jaraco/keyrings.alt/pull/46
-PATCHES=( "${FILESDIR}/${P}-pycryptodome.patch" )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/keyrings_alt/metadata.xml b/dev-python/keyrings_alt/metadata.xml
deleted file mode 100644
index 59728c331..000000000
--- a/dev-python/keyrings_alt/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gentoo@chymera.eu</email>
- <name>Horea Christian</name>
- </maintainer>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
- This package distributes backends extracted from the main Python keyring
- project to make them available for those who wish to employ them, but
- are discouraged for general production use. Include this module and use
- its backends at your own risk.
- For example, the PlaintextKeyring stores passwords in plain text on the
- file system, defeating the intended purpose of this library to encourage
- best practices for security.
- </longdescription>
- <upstream>
- <remote-id type="github">jaraco/keyrings.alt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/nwbinspector/Manifest b/dev-python/nwbinspector/Manifest
index f5e2c79b7..fa770778b 100644
--- a/dev-python/nwbinspector/Manifest
+++ b/dev-python/nwbinspector/Manifest
@@ -1 +1,2 @@
DIST nwbinspector-0.3.9.tar.gz 443247 BLAKE2B 4d1adbca50ff0f5d8278d71063d1248a4b22da952de6dc3e4984d58285d1acecf5adfe85b2a624df20e8064a69fa2ffe2c4a23ec1d2a579446fc451e7cd04bd5 SHA512 e8752fadbfcdb9a46f5c16771d789995fdab378720861dbe15b100f8e07cfad58f99a75fbda8e7631f06ec5671e16b3ac48a002606b658b018d50dd62151cc5e
+DIST nwbinspector-0.4.12.tar.gz 455926 BLAKE2B 4bb8b493367593fdd575535e574b8494980a60a6ed1983a08f895c106e03e25ad6cd76b6c72cfcc42a34778d5059c90940bc9907dc9d87569df79aeae1698135 SHA512 60bb799beaff61612e7993069a34f62e0b6053dc3e820474f33c020c02f8c7b11bed0bca7e2bb335edfd60b06159be90b1a50dfcd497f6a3fb0916dc49cf17b7
diff --git a/dev-python/nwbinspector/nwbinspector-0.4.12.ebuild b/dev-python/nwbinspector/nwbinspector-0.4.12.ebuild
new file mode 100644
index 000000000..bea484ec2
--- /dev/null
+++ b/dev-python/nwbinspector/nwbinspector-0.4.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 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="Inspect NWB files for compliance with NWB Best Practices"
+HOMEPAGE="https://github.com/NeurodataWithoutBorders/nwbinspector"
+SRC_URI="https://github.com/NeurodataWithoutBorders/nwbinspector/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/natsort[${PYTHON_USEDEP}]
+ dev-python/pynwb[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/tqdm[${PYTHON_USEDEP}]
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_IGNORE=(
+ tests/test_inspector.py
+ tests/unit_tests/test_time_series.py
+ )
+ epytest
+}