From 008918cf32c6cb69a75b3bc4408ec160b5a80603 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Thu, 30 Nov 2023 10:29:02 -0300 Subject: [PATCH 1/5] pin version of empy to 3.3.4 --- setup.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0281aeeb..fc736a17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,9 @@ python_requires = >=3.6 install_requires = coloredlogs; sys_platform == 'win32' distlib - EmPy + # pining empy to 3.3.4 since the release of empy 4 breaks colcon + # see https://github.com/colcon/colcon-core/issues/602 + EmPy==3.3.4 importlib-metadata; python_version < "3.8" packaging # the pytest dependency and its extensions are provided for convenience From 42cb1ee873c8f9aa90642ea48805f6f045cb2dcd Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Thu, 30 Nov 2023 10:45:34 -0300 Subject: [PATCH 2/5] empy constraing to <4 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index fc736a17..fe93a024 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,9 +29,9 @@ python_requires = >=3.6 install_requires = coloredlogs; sys_platform == 'win32' distlib - # pining empy to 3.3.4 since the release of empy 4 breaks colcon + # pining empy to <4 since the release of empy 4 breaks colcon # see https://github.com/colcon/colcon-core/issues/602 - EmPy==3.3.4 + EmPy<4 importlib-metadata; python_version < "3.8" packaging # the pytest dependency and its extensions are provided for convenience From 6d02acbb7834d2c753bed945b47cfbdf506c80fe Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Thu, 30 Nov 2023 10:46:00 -0300 Subject: [PATCH 3/5] update stdeb.cfg to empy <4 --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index 9c4793cd..3fb99484 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [colcon-core] No-Python2: -Depends3: python3-distlib, python3-empy, python3-packaging, python3-pytest, python3-setuptools, python3 (>= 3.8) | python3-importlib-metadata +Depends3: python3-distlib, python3-empy (<4), python3-pytest, python3-setuptools, python3 (>= 3.8) | python3-importlib-metadata Recommends3: python3-pytest-cov Suggests3: python3-pytest-repeat, python3-pytest-rerunfailures Suite: focal jammy bullseye bookworm From 918df291c97d41d1e8db6c2bd072d9b3bee67395 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Thu, 30 Nov 2023 11:21:49 -0300 Subject: [PATCH 4/5] restore python3-packaging --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index 3fb99484..08bafc8e 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [colcon-core] No-Python2: -Depends3: python3-distlib, python3-empy (<4), python3-pytest, python3-setuptools, python3 (>= 3.8) | python3-importlib-metadata +Depends3: python3-distlib, python3-empy (<4), python3-packaging, python3-pytest, python3-setuptools, python3 (>= 3.8) | python3-importlib-metadata Recommends3: python3-pytest-cov Suggests3: python3-pytest-repeat, python3-pytest-rerunfailures Suite: focal jammy bullseye bookworm From 22bdb727beb3fa752b62db342738ca1bd1ac40bb Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Thu, 30 Nov 2023 11:21:58 -0300 Subject: [PATCH 5/5] remove comment --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index fe93a024..04cae833 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,8 +29,6 @@ python_requires = >=3.6 install_requires = coloredlogs; sys_platform == 'win32' distlib - # pining empy to <4 since the release of empy 4 breaks colcon - # see https://github.com/colcon/colcon-core/issues/602 EmPy<4 importlib-metadata; python_version < "3.8" packaging