From 946e70f7778c92f41eaf89afb3951962f81a9bec Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 4 Dec 2024 16:06:43 -0500 Subject: [PATCH 1/3] differentiate package version and flowlist version --- lciafmt/data/description.yaml | 3 ++- lciafmt/util.py | 1 + setup.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lciafmt/data/description.yaml b/lciafmt/data/description.yaml index 225ac34..70fea4e 100644 --- a/lciafmt/data/description.yaml +++ b/lciafmt/data/description.yaml @@ -1,6 +1,7 @@ base: >+ [Method][version] is built from LCIA Formatter v[LCIAfmt_version] and - flows from the Federal Elementary Flow List (FEDEFL) v[FEDEFL_version] + flows from v[FEDEFL_version] of the Federal Elementary Flow List (FEDEFL), + using fedelemflowlist v[fedelemflowlist_version]. description: >+ [Method] source file: [url] diff --git a/lciafmt/util.py b/lciafmt/util.py index ffa47e7..f4992d0 100644 --- a/lciafmt/util.py +++ b/lciafmt/util.py @@ -210,6 +210,7 @@ def generate_method_description(name: str, desc = (desc .replace('[LCIAfmt_version]', pkg_version_number) .replace('[FEDEFL_version]', flow_list_specs['list_version']) + .replace('[fedelemflowlist_version]', flow_list_specs['package_version']) .replace('[Method]', method_meta['name']) .replace('[version]', version) .replace('[citation]', method_meta['citation']) diff --git a/setup.py b/setup.py index 65cd8f1..dca532c 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ package_data={'lciafmt': ["data/*.*"]}, include_package_data=True, python_requires=">=3.9", - install_requires=["fedelemflowlist @ git+https://github.com/USEPA/fedelemflowlist.git@develop#egg=fedelemflowlist", + install_requires=["fedelemflowlist @ git+https://github.com/USEPA/fedelemflowlist.git@version#egg=fedelemflowlist", "esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy", "olca-schema>=0.0.11", "pandas>=0.22", From acd3c87c54db281f240c12880d6efea54a09a343 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 4 Dec 2024 16:52:21 -0500 Subject: [PATCH 2/3] use tool_version instead of package_version --- lciafmt/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lciafmt/util.py b/lciafmt/util.py index f4992d0..049a94b 100644 --- a/lciafmt/util.py +++ b/lciafmt/util.py @@ -210,7 +210,7 @@ def generate_method_description(name: str, desc = (desc .replace('[LCIAfmt_version]', pkg_version_number) .replace('[FEDEFL_version]', flow_list_specs['list_version']) - .replace('[fedelemflowlist_version]', flow_list_specs['package_version']) + .replace('[fedelemflowlist_version]', flow_list_specs['tool_version']) .replace('[Method]', method_meta['name']) .replace('[version]', version) .replace('[citation]', method_meta['citation']) From f619c58fbf8ca5a401dc3aa7ba11998e15a6f60a Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 4 Dec 2024 17:02:40 -0500 Subject: [PATCH 3/3] point back to develop --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dca532c..65cd8f1 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ package_data={'lciafmt': ["data/*.*"]}, include_package_data=True, python_requires=">=3.9", - install_requires=["fedelemflowlist @ git+https://github.com/USEPA/fedelemflowlist.git@version#egg=fedelemflowlist", + install_requires=["fedelemflowlist @ git+https://github.com/USEPA/fedelemflowlist.git@develop#egg=fedelemflowlist", "esupy @ git+https://github.com/USEPA/esupy.git@develop#egg=esupy", "olca-schema>=0.0.11", "pandas>=0.22",