From 6e256c3b0fdee6b5b64bf2e7d4af89f8bf8b235e Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 10:46:14 -0400 Subject: [PATCH 1/7] noop chnage --- src/allotropy/allotrope/converter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/allotropy/allotrope/converter.py b/src/allotropy/allotrope/converter.py index b4a463001..871f1f6f6 100644 --- a/src/allotropy/allotrope/converter.py +++ b/src/allotropy/allotrope/converter.py @@ -163,6 +163,7 @@ def add_custom_information_document( def _convert_model_key_to_dict_key(key: str) -> str: + key = "" key = SPECIAL_KEYS.get(key, key) if key.startswith("___") and key[3].isdigit(): key = key[3:] From 96cab391f2ef3235b5e6df53463871621942e35e Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 10:46:57 -0400 Subject: [PATCH 2/7] noop chnage --- src/allotropy/allotrope/converter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allotropy/allotrope/converter.py b/src/allotropy/allotrope/converter.py index 871f1f6f6..381b855c7 100644 --- a/src/allotropy/allotrope/converter.py +++ b/src/allotropy/allotrope/converter.py @@ -163,7 +163,6 @@ def add_custom_information_document( def _convert_model_key_to_dict_key(key: str) -> str: - key = "" key = SPECIAL_KEYS.get(key, key) if key.startswith("___") and key[3].isdigit(): key = key[3:] @@ -189,6 +188,7 @@ def _validate_structuring(val: Any, model: Any) -> None: for list_value, model_list_value in zip(val, model, strict=True): _validate_structuring(list_value, model_list_value) if not isinstance(val, dict): + val = "" return for key, value in val.items(): From 9f8a224a84c6433963d4af4ca41f9888be66654f Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 11:00:47 -0400 Subject: [PATCH 3/7] Force click --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 6ef7c1688..be0a3a22f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ classifiers = [ dependencies = [ "cattrs >= 23.2.0", "chardet >= 5.2.0", + "click <= 8.2.1", "defusedxml >= 0.7.1", # NOTE: jsonschema 4.18.0 introduces a serious performance regression, seemingly due to use of new # referencing library. From 3cd6e856674a0261d1792a98b679e3f0ec35584d Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 11:05:00 -0400 Subject: [PATCH 4/7] Try this --- .github/workflows/test.yml | 2 ++ pyproject.toml | 1 - src/allotropy/allotrope/converter.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bc6c284b..d87bf3e3a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,6 +65,8 @@ jobs: python-version: "3.11.9" - name: Install hatch run: pip install hatch + - name: Install click + run: pip install click==8.2.1 - name: Lint run: hatch run lint diff --git a/pyproject.toml b/pyproject.toml index be0a3a22f..6ef7c1688 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,6 @@ classifiers = [ dependencies = [ "cattrs >= 23.2.0", "chardet >= 5.2.0", - "click <= 8.2.1", "defusedxml >= 0.7.1", # NOTE: jsonschema 4.18.0 introduces a serious performance regression, seemingly due to use of new # referencing library. diff --git a/src/allotropy/allotrope/converter.py b/src/allotropy/allotrope/converter.py index 381b855c7..b4a463001 100644 --- a/src/allotropy/allotrope/converter.py +++ b/src/allotropy/allotrope/converter.py @@ -188,7 +188,6 @@ def _validate_structuring(val: Any, model: Any) -> None: for list_value, model_list_value in zip(val, model, strict=True): _validate_structuring(list_value, model_list_value) if not isinstance(val, dict): - val = "" return for key, value in val.items(): From b3aa0520d8e415adf28ff301b2207aa2f78f7d48 Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 11:10:11 -0400 Subject: [PATCH 5/7] Everywhere --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d87bf3e3a..8f7ea0b4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,8 @@ jobs: python-version: "3.10" - name: Install hatch run: pip install hatch + - name: Install click + run: pip install click==8.2.1 - name: Run Tests run: hatch run test_all.py3.10:test @@ -37,6 +39,8 @@ jobs: python-version: "3.11.9" - name: Install hatch run: pip install hatch + - name: Install click + run: pip install click==8.2.1 - name: Run Tests run: hatch run test_all.py3.11:test @@ -51,6 +55,8 @@ jobs: python-version: "3.12" - name: Install hatch run: pip install hatch + - name: Install click + run: pip install click==8.2.1 - name: Run Tests run: hatch run test_all.py3.12:test From 67d5b2a7abda447c6b7040bf68fc25a1052ba1fa Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 11:11:11 -0400 Subject: [PATCH 6/7] Actually this --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f7ea0b4d..5b4081252 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - name: Install hatch run: pip install hatch - name: Install click - run: pip install click==8.2.1 + run: pip install click!=8.3.0 - name: Run Tests run: hatch run test_all.py3.10:test @@ -40,7 +40,7 @@ jobs: - name: Install hatch run: pip install hatch - name: Install click - run: pip install click==8.2.1 + run: pip install click!=8.3.0 - name: Run Tests run: hatch run test_all.py3.11:test @@ -56,7 +56,7 @@ jobs: - name: Install hatch run: pip install hatch - name: Install click - run: pip install click==8.2.1 + run: pip install click!=8.3.0 - name: Run Tests run: hatch run test_all.py3.12:test @@ -72,7 +72,7 @@ jobs: - name: Install hatch run: pip install hatch - name: Install click - run: pip install click==8.2.1 + run: pip install click!=8.3.0 - name: Lint run: hatch run lint From deb321a3d42d1e8a13d739796c54486e19cdc851 Mon Sep 17 00:00:00 2001 From: Nathan Stender Date: Fri, 19 Sep 2025 11:12:40 -0400 Subject: [PATCH 7/7] Add comment with issue --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5b4081252..350944837 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,7 @@ jobs: python-version: "3.11.9" - name: Install hatch run: pip install hatch + # NOTE: due to bug: https://github.com/pallets/click/issues/3066 - name: Install click run: pip install click!=8.3.0 - name: Run Tests