Skip to content

Commit

Permalink
differentiate package version and flowlist version
Browse files Browse the repository at this point in the history
  • Loading branch information
bl-young committed Dec 4, 2024
1 parent aa0d144 commit 946e70f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lciafmt/data/description.yaml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
1 change: 1 addition & 0 deletions lciafmt/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 946e70f

Please sign in to comment.