Skip to content

Commit b93792f

Browse files
Merge pull request #910 from guzman-raphael/master
Rename `setuptools_certificate` dependency to `otumat`
2 parents 7ae1bfc + cc3c52a commit b93792f

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Release notes
22

3-
### 0.13.2 -- TBD
3+
### 0.13.2 -- May 7, 2021
4+
* Update `setuptools_certificate` dependency to new name `otumat`
45
* Bugfix - Explicit calls to `dj.Connection` throw error due to missing `host_input` (#895) PR #907
56
* Bugfix - Correct count of deleted items. (#897) PR #912
67

datajoint/plugin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import pkg_resources
33
from pathlib import Path
44
from cryptography.exceptions import InvalidSignature
5-
from setuptools_certificate import hash_pkg, verify
5+
from otumat import hash_pkg, verify
66

77

88
def _update_error_stack(plugin_name):
@@ -11,10 +11,10 @@ def _update_error_stack(plugin_name):
1111
base_meta = pkg_resources.get_distribution(base_name)
1212
plugin_meta = pkg_resources.get_distribution(plugin_name)
1313

14-
data = hash_pkg(str(Path(plugin_meta.module_path, plugin_name)))
14+
data = hash_pkg(pkgpath=str(Path(plugin_meta.module_path, plugin_name)))
1515
signature = plugin_meta.get_metadata('{}.sig'.format(plugin_name))
1616
pubkey_path = str(Path(base_meta.egg_info, '{}.pub'.format(base_name)))
17-
verify(pubkey_path, data, signature)
17+
verify(pubkey_path=pubkey_path, data=data, signature=signature)
1818
print('DataJoint verified plugin `{}` detected.'.format(plugin_name))
1919
return True
2020
except (FileNotFoundError, InvalidSignature):

docs-parts/intro/Releases_lang1.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
0.13.2 -- TBD
2-
-------------
1+
0.13.2 -- May 7, 2021
2+
----------------------
3+
* Update `setuptools_certificate` dependency to new name `otumat`
34
* Bugfix - Explicit calls to `dj.Connection` throw error due to missing `host_input` (#895) PR #907
45
* Bugfix - Correct count of deleted items. (#897) PR #912
56

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ pydot
99
minio>=7.0.0
1010
matplotlib
1111
cryptography
12-
setuptools_certificate
12+
otumat

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
3333
install_requires=requirements,
3434
python_requires='~={}.{}'.format(*min_py_version),
35-
setup_requires=['setuptools_certificate'], # maybe remove due to conflicts?
35+
setup_requires=['otumat'], # maybe remove due to conflicts?
3636
pubkey_path='./datajoint.pub'
3737
)

0 commit comments

Comments
 (0)