Fix tests, fix hookery dependency spec

Bump version: 1.33.0 → 1.34.0

Author: jbasko

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.33.0
+current_version = 1.34.0
 commit = true
 tag = false
 

LICENSE

@@ -1,7 +1,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2017 Jazeps Basko
+Copyright (c) 2017-2018 Jazeps Basko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.rst

@@ -15,7 +15,6 @@ Main Features
 * Any depth of sections allowed
 * INI (ConfigParser), JSON, YAML formats
 * click framework integration
-* Designed for humans
 
 
 Documentation

configmanager/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.33.0'
+__version__ = '1.34.0'
 
 from .managers import Config
 from .items import Item

requirements.txt

@@ -3,7 +3,7 @@
 #
 six ==1.10.0
 future ==0.16.0
-hookery >=1.1.1, <=2.0.0
+hookery == 1.4.0
 
 #
 # Potentially optional dependencies

setup.py

@@ -26,7 +26,7 @@ def read(fname):
     description='Forget about configparser, YAML, or JSON parsers. Focus on configuration.',
     long_description=read('README.rst'),
     packages=['configmanager'],
-    install_requires=['six==1.10.0', 'future==0.16.0', 'configparser==3.5.0', 'hookery >=1.1.1, <=2.0.0'],
+    install_requires=['six==1.10.0', 'future==0.16.0', 'configparser==3.5.0', 'hookery == 1.4.0'],
     extras_require={
         'yaml': ['PyYAML'],
         'click': ['click'],

tests/test_hooks.py

@@ -4,6 +4,14 @@
 from configmanager.utils import not_set
 
 
+def sub_dict(dct, keys):
+    """
+    Helper for tests that creates a dictionary from the given dictionary
+    with just the listed keys included.
+    """
+    return {k: dct[k] for k in keys if k in dct}
+
+
 def test_hooks_available_on_all_sections():
     config = Config({
         'uploads': {
@@ -30,11 +38,11 @@ def test_not_found_hook():
 
     @config.hooks.not_found
     def first_hook(*args, **kwargs):
-        calls.append(('first', args, kwargs))
+        calls.append(('first', args, sub_dict(kwargs, ('section', 'name'))))
 
     @config.hooks.not_found
     def second_hook(*args, **kwargs):
-        calls.append(('second', args, kwargs))
+        calls.append(('second', args, sub_dict(kwargs, ('section', 'name'))))
 
     assert len(calls) == 0
 
@@ -56,7 +64,7 @@ def second_hook(*args, **kwargs):
     # the hook handlers again, including any subsequent hook handlers as part of current event.
     @config.hooks.not_found
     def third_hook(*args, **kwargs):
-        calls.append(('third', args, kwargs))
+        calls.append(('third', args, sub_dict(kwargs, ('section', 'name'))))
 
         assert kwargs['section']
         assert kwargs['name']
@@ -68,7 +76,7 @@ def third_hook(*args, **kwargs):
     # Fourth hook will never be called because the third hook already resolves the missing name
     @config.hooks.not_found
     def fourth_hook(*args, **kwargs):
-        calls.append(('fourth', args, kwargs))
+        calls.append(('fourth', args, sub_dict(kwargs, ('section', 'name'))))
 
     assert len(calls) == 4
 
@@ -98,11 +106,11 @@ def test_item_added_to_section_hook():
 
     @config.hooks.item_added_to_section
     def item_added_to_section(*args, **kwargs):
-        calls.append(('first', args, kwargs))
+        calls.append(('first', args, sub_dict(kwargs, ('section', 'subject', 'alias'))))
 
     @config.hooks.item_added_to_section
     def item_added_to_section2(*args, **kwargs):
-        calls.append(('second', args, kwargs))
+        calls.append(('second', args, sub_dict(kwargs, ('section', 'subject', 'alias'))))
 
     assert calls == []
 
@@ -191,11 +199,11 @@ def test_section_added_to_section_hook():
 
     @config.hooks.section_added_to_section
     def section_added_to_section1(*args, **kwargs):
-        calls.append(('on_root', args, kwargs))
+        calls.append(('on_root', args, sub_dict(kwargs, ('section', 'subject', 'alias'))))
 
     @config.uploads.hooks.section_added_to_section
     def section_added_to_section2(*args, **kwargs):
-        calls.append(('on_uploads', args, kwargs))
+        calls.append(('on_uploads', args, sub_dict(kwargs, ('section', 'subject', 'alias'))))
 
     assert calls == []