version 1.0.4, update aiohttp to handle 'no_proxy' setting (Bug #54054)

HISTORY.rst

@@ -2,6 +2,12 @@
 History
 =======
 
+1.0.4 (2021-11-15)
+------------------
+
+* Update `aiohttp <https://github.com/aio-libs/aiohttp>`_ to (at least) Version ``3.8.1``, which fixes `aiohttp not honoring "no_proxy" <https://github.com/aio-libs/aiohttp/issues/4431>`_.
+* Update development and testing dependencies.
+
 1.0.3 (2021-03-25)
 ------------------
 

Makefile

@@ -108,7 +108,7 @@ test: ## run tests with the current Python interpreter
 		echo "Using UCS_HOST, UCS_USERDN and UCS_PASSWORD from env."; \
 		export UCS_HOST UCS_USERDN UCS_PASSWORD; \
 	else \
-		echo "Starting UCS in Docker. Set UCS_HOST and UCS_AUTH to use an existing UCS server."; \
+		echo "Starting UCS in Docker. Set UCS_HOST, UCS_USERDN and UCS_PASSWORD to use an existing UCS server."; \
 		make start-docker-container; \
 		export UCS_CONTAINER_IP=`$(CONTAINER_IP_CMD)`; \
 		if [ -z "$$UCS_CONTAINER_IP" ]; then \
@@ -126,7 +126,7 @@ test-all: ## run tests with every supported Python version using tox
 		echo "Using UCS_HOST, UCS_USERDN and UCS_PASSWORD from env."; \
 		export UCS_HOST UCS_USERDN UCS_PASSWORD; \
 	else \
-		echo "Starting UCS in Docker. Set UCS_HOST and UCS_AUTH to use an existing UCS server."; \
+		echo "Starting UCS in Docker. Set UCS_HOST, UCS_USERDN and UCS_PASSWORD to use an existing UCS server."; \
 		make start-docker-container; \
 		export UCS_CONTAINER_IP=`$(CONTAINER_IP_CMD)`; \
 		if [ -z "$$UCS_CONTAINER_IP" ]; then \
@@ -146,7 +146,7 @@ test-all: ## run tests with every supported Python version using tox
 		echo "Using UCS_HOST, UCS_USERDN and UCS_PASSWORD from env."; \
 		export UCS_HOST UCS_USERDN UCS_PASSWORD; \
 	else \
-		echo "Starting UCS in Docker. Set UCS_HOST and UCS_AUTH to test using existing UCS."; \
+		echo "Starting UCS in Docker. Set UCS_HOST, UCS_USERDN and UCS_PASSWORD to test using existing UCS."; \
 		make start-docker-container; \
 		export UCS_CONTAINER_IP=`$(CONTAINER_IP_CMD)`; \
 	fi; \

requirements.txt

@@ -1,5 +1,5 @@
-aiohttp==3.7.4
-async-property==0.2.1
-click==7.1.2
-docker==4.4.4
-requests==2.25.1
+aiohttp>=3.8.1,<4
+async-property>=0.2.1,<0.3
+click>=8.0.3,<9
+docker>=5.0.3,<6
+requests>=2.26,<3

requirements_dev.txt

@@ -1,8 +1,8 @@
 bumpversion==0.6.0
-coverage==5.4
-pre-commit==2.10.0
-Sphinx==3.4.3
-tox==3.21.3
-twine==3.3.0
-watchdog==1.0.2
-wheel==0.36.2
+coverage>=5,<6  # coverage-conditional-plugin 0.4.0 depends on coverage<6.0 and >=5.0
+pre-commit>=2.15.0,<3
+Sphinx>=4.3.0,<5
+tox>=3.24.4,<4
+twine>=3.6.0,<4
+watchdog>=2.1.6,<3
+wheel>=0.37.0,<1

requirements_test.txt

@@ -1,9 +1,9 @@
-attrs==20.3.0
-coverage-conditional-plugin==0.3.1
-factory_boy==3.2.0
-Faker==8.8.2
-ldap3==2.9
-pytest==6.2.2
-pytest-asyncio==0.14.0
-pytest-runner==5.2
-ruamel.yaml==0.16.12
+attrs>=21.2.0,<22
+coverage-conditional-plugin>=0.4.0,<0.5
+factory_boy>=3.2.1,<4
+Faker>=9.8.1,<10
+ldap3>=2.9.1,<3
+pytest>=6.2.5,<7
+pytest-asyncio>=0.16.0,<0.17
+pytest-runner>=5.3.1,<6
+ruamel.yaml>=0.17.17,<0.18

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.3
+current_version = 1.0.4
 commit = True
 tag = True
 

setup.py

@@ -50,6 +50,6 @@
     python_requires=">=3.6",
     scripts=["update_openapi_client"],
     url="https://github.com/univention/python-udm-rest-api-client",
-    version="1.0.3",
+    version="1.0.4",
     zip_safe=False,
 )

tests/test_udm.py

@@ -77,8 +77,11 @@ async def load_obj_by_dn(udm, result):
             object_type = result["univentionObjectType"].value
             if object_type not in BAD_MODULE_NAMES and "://" not in result.entry_dn:  # Bug #50175
                 all_objs.setdefault(object_type, []).append(result)
-        module_names = all_objs.keys()
-        random.shuffle([str(m) for m in module_names])
+        module_names = [str(m) for m in all_objs.keys()]
+        # ignore for now: Bug 54064 - UDM REST API does not handle nagios/service objects
+        # HTTP 500 - RuntimeError: Object was not opened
+        module_names = [m for m in module_names if m != "nagios/service"]
+        random.shuffle(module_names)
         logger.info("Reading %d objects of different UDM module types...", len(module_names))
         entries = [random.choice(all_objs[module_name]) for module_name in module_names]
         objs = await asyncio.gather(*(load_obj_by_dn(udm, entry) for entry in entries))
@@ -101,4 +104,6 @@ async def test_modules_list(udm_kwargs):
 async def test_unknown_modules(udm_kwargs):
     async with UDM(**udm_kwargs) as udm:
         modules_list = await udm.unknown_modules()
+        # work around Bug 54063 - UDM REST API doesn't handle ms/* (MS group policy) objects / modules
+        modules_list = [x for x in modules_list if not x.startswith("ms/")]
         assert modules_list == []

udm_rest_client/__init__.py

@@ -36,4 +36,4 @@
 ]
 __author__ = """Daniel Troeder"""
 __email__ = "troeder@univention.de"
-__version__ = "1.0.3"
+__version__ = "1.0.4"