Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
2e941b0
Add gas volume units
cmutel Feb 2, 2024
be0a4d3
Fix inconsistent comma in suffix
cmutel Feb 2, 2024
3858ac4
Merge branch 'main' of https://github.com/cmutel/flowmapper
cmutel Feb 2, 2024
1951a2c
Add groundwater category mapping
cmutel Feb 19, 2024
5e2de3b
Add radiation unit conversion
cmutel Feb 19, 2024
5900476
Fix country code extraction to only use existing countries
cmutel Feb 19, 2024
0bbd464
Better understand pint unit errors
cmutel Feb 19, 2024
3ff3079
Match natural resources with a different subcategory
cmutel Feb 19, 2024
905758b
Black reformatting
cmutel Feb 19, 2024
38ba9b8
Add more category matching
cmutel Feb 26, 2024
67de996
Add some manual matches
cmutel Feb 26, 2024
edaa6ae
Add more non-country codes
cmutel Feb 26, 2024
8f054c1
Match upper and lower case country codes
cmutel Feb 26, 2024
7f0d2f4
Add tests for upper and lowercase country codes
cmutel Feb 26, 2024
f521e05
isort and black linting
cmutel Mar 8, 2024
66c71cf
Rewrite `Context` away from a dataclass
cmutel Mar 8, 2024
043c044
Add description of concept
cmutel Mar 8, 2024
fbc2f1d
Some match simplifications
cmutel Mar 8, 2024
2abf326
Refactor units
cmutel Mar 11, 2024
a2c4c61
Update README.md
cmutel Mar 11, 2024
63160a3
Add CAS to main library imports
cmutel Apr 19, 2024
a51b297
Correctly mark optional transformations for Typer
cmutel Apr 19, 2024
2997a68
Add generic class for strings
cmutel Apr 19, 2024
38f75a8
Normalized string for `None` is `''`
cmutel Apr 19, 2024
bc6e01d
Export CAS as string
cmutel Apr 19, 2024
809d764
Move constants to randonneur files
cmutel Apr 19, 2024
e454e1b
Remove unused code
cmutel Apr 19, 2024
6919c1c
Add StringList class for context
cmutel Apr 19, 2024
7273600
Remove default unit harmonization from Unit class
cmutel Apr 19, 2024
8e30e56
Linting and cleanup
cmutel Apr 19, 2024
cb77718
Fill out Context class
cmutel Apr 19, 2024
ee267d4
Move away from raw value labels
cmutel Apr 19, 2024
ee32ca7
Use Identifier instead of UUID
cmutel Apr 19, 2024
de934d7
Store original and transformed on StringField
cmutel Apr 19, 2024
64dbd7b
Add Randonneur application funcs
cmutel Apr 19, 2024
c7acd05
Compare context against normalized values
cmutel Apr 20, 2024
4659ac1
CAS digits should have all numbers
cmutel Apr 20, 2024
f0e1854
More CAS string cleaning
cmutel Apr 21, 2024
4a9fed2
Improve str conversion of Context
cmutel Apr 21, 2024
fee12c2
Start fixing tests
cmutel Apr 21, 2024
4331a78
Add cubic meter conversion
cmutel Apr 22, 2024
4f1e335
Include conversion factor from transformations
cmutel Apr 22, 2024
a0dde7d
Allow case-insensitive stringfield comparison
cmutel Apr 22, 2024
910a804
Add __bool__ methods
cmutel Apr 22, 2024
07fb336
Unit: Don't crash if Pint doesn't recognize unit string
cmutel Apr 22, 2024
99d4cef
Improve string representations
cmutel Apr 22, 2024
86d3925
Prepare transformations recursively
cmutel Apr 22, 2024
f7c72ea
Add match_resources_with_wrong_subcontext
cmutel Apr 22, 2024
aac91bb
Linting
cmutel Apr 22, 2024
d1d64e1
Update test_context.py
cmutel Apr 22, 2024
22803e8
Adjust Excel export column widths
cmutel Apr 22, 2024
f5b6288
Can't write raw `=` in Excel
cmutel Apr 22, 2024
bc220d9
Change results sorting function
cmutel Apr 22, 2024
f8c00b1
Pull conversion factor from match strategies
cmutel Apr 22, 2024
1e138aa
Special case regionalized water unit conversion
cmutel Apr 22, 2024
c6230bf
Need to apply transformations to target data for consistency
cmutel Apr 22, 2024
e6d5ddd
Linting
cmutel Apr 22, 2024
6fdd9a9
Add identifier to Flow repr
cmutel Apr 22, 2024
5f3cc50
Unit string in transformations is case independent
cmutel Apr 22, 2024
fbd47a2
Fix check for missing Pint conversion factor
cmutel Apr 22, 2024
a693b5f
Add another standard unit conversion
cmutel Apr 22, 2024
f5f1c3c
Now you have two problems
cmutel Apr 25, 2024
8433afb
Allow name substitution with location suffix
cmutel Apr 25, 2024
80623c5
Fix country code tests
cmutel Apr 25, 2024
06ec4d6
Add missing flows to Excel export
cmutel Apr 26, 2024
72f2919
Fix tests
cmutel Apr 29, 2024
ed8be96
Update tests/test_stringfield.py
cmutel Apr 29, 2024
ef10a74
Update tests/test_cas.py
cmutel Apr 29, 2024
716626a
Update tests/test_stringfield.py
cmutel Apr 29, 2024
938e9f0
Merge branch 'main' into refactor
cmutel Apr 29, 2024
25dcf18
Merge pull request #8 from cmutel/refactor
cmutel Apr 29, 2024
3777d76
Py 3.10+ compatible
cmutel Apr 29, 2024
d78235f
Sort CLI Randonneur output
cmutel May 3, 2024
6d74520
Merge branch 'refactor' of https://github.com/cmutel/flowmapper into …
cmutel May 3, 2024
a64534a
Merge pull request #9 from cmutel/refactor
cmutel May 3, 2024
762793c
Make main function not CLI-dependent
cmutel May 7, 2024
f637273
0.1
cmutel May 7, 2024
f8759a1
Fix package data
cmutel May 7, 2024
3b1c274
0.1.1
cmutel May 7, 2024
3edbced
0.2
cmutel Sep 4, 2024
9068ae3
Update some manual maps
cmutel Sep 5, 2024
d731431
Add more CLI commands
cmutel Dec 2, 2024
5c8988f
Add more extractors
cmutel Dec 2, 2024
ba64184
Fix location substitution
cmutel Dec 2, 2024
bf00d3c
0.3
cmutel Dec 2, 2024
4df2465
Switch to absolute imports
cmutel Dec 23, 2024
f8db9bf
Linting
cmutel Dec 23, 2024
2bff883
Removed unused arg documentation
cmutel Dec 23, 2024
fca62b2
Make Flowmap.get_single_match more functional
cmutel Dec 23, 2024
b79570e
Improve matching for location and suffixes
cmutel Feb 21, 2025
cdeb96a
Add RoE location
cmutel Feb 21, 2025
0bd2c81
0.3.1
cmutel Feb 21, 2025
097e262
Add ability to build manual matchings as input transformations
cmutel Mar 3, 2025
34c5d2f
Fix JSON syntax error
cmutel Jul 17, 2025
dc8095c
Add additional ecoinvent 3.10 manual mappings
cmutel Jul 17, 2025
05d8907
0.4.1
cmutel Jul 18, 2025
b8a895d
Remove conflicting synonyms from ecospold2
cmutel Jul 28, 2025
a8df8ef
Differentiate synonyms by priority
cmutel Jul 28, 2025
2b984a0
0.4.2
cmutel Jul 28, 2025
509a277
Small fix to ores
cmutel Oct 17, 2025
4ae830a
Add more control for logging
cmutel Nov 7, 2025
186b14c
Note that synonyms shouldn't overlap in README
cmutel Nov 7, 2025
4e782ba
Move to `src` layout
cmutel Nov 7, 2025
f7f5aa1
Complete move to absolute imports
cmutel Nov 7, 2025
82a5af0
Remove loguru
cmutel Nov 7, 2025
f4a5fa1
Add additional tests for missing code paths
cmutel Nov 7, 2025
9f17313
Bump minimum Python version
cmutel Nov 7, 2025
ac7b5d1
Allow match functions to see all source and target flows
cmutel Nov 7, 2025
01ee4cd
Add fixes for required randonneur fields
cmutel Nov 7, 2025
860ee1b
Improve test reporting and edge cases
cmutel Nov 7, 2025
00a3b0a
Additional test fixes
cmutel Nov 7, 2025
1c7d383
Allow profiling of matching
cmutel Nov 7, 2025
f22e61d
Patch broken tests for now
cmutel Nov 7, 2025
14d27e7
Avoid running tests twice if they error out
cmutel Nov 7, 2025
0a13345
Reduce profiler interval for smaller result file sizes
cmutel Nov 8, 2025
1f514cc
Start refactoring to version flows
cmutel Nov 8, 2025
b4950ba
Add new field for oxidation state
cmutel Nov 8, 2025
d6a6348
Redo unit field
cmutel Nov 8, 2025
c891725
Change to `cas_number`
cmutel Nov 8, 2025
91d2d20
Redo CAS field
cmutel Nov 8, 2025
aa767ca
Remove StringList
cmutel Nov 8, 2025
1abd0e2
Add remove_unit_slash
cmutel Nov 8, 2025
c101918
Test split_location_suffix
cmutel Nov 8, 2025
8f691aa
Update StringField
cmutel Nov 8, 2025
e213341
Update ContextField
cmutel Nov 8, 2025
9c7a818
Big progress on refactoring
cmutel Nov 11, 2025
86ac29f
Add equality operator for CASField
cmutel Nov 12, 2025
380344d
Add reset_current and update_current to NormalizedFlow
cmutel Nov 12, 2025
ad9e05b
Add is_resource to ContextField
cmutel Nov 12, 2025
eaae8c1
Fix exporting of results
cmutel Nov 14, 2025
301429e
Add context manager for temporarily changing normalized flows
cmutel Nov 14, 2025
6ed9096
Fix matching for more functions
cmutel Nov 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
py-version: ["3.9", "3.10", "3.11", "3.12"]
py-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@ dmypy.json

# Pyre type checker
.pyre/
pyrightconfig.json
36 changes: 28 additions & 8 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,36 @@
# flowmapper Changelog

All notable changes to this project will be documented in this file.
## [0.4.2] - 2025-07-28

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Remove conflicting synonyms when parsing ecospold2
* Prioritize ionic-form synonyms over more generic synonyms

## [Unreleased]
## [0.4.1] - 2025-07-18

## [0.1.0] - 2022-03-22
* Updated some manual SimaPro - ecoinvent 3.10 matches

### Added
## [0.4] - 2025-03-03

### Changed
* Add ability to build manual matchings as input transformations

### Removed
### [0.3.1] - 2025-02-21

* Minor fixes to input data
* Minor fixes to matching functions

## [0.3] - 2024-12-02

* Add more command line options
* Small bugfixes

## [0.2] - 2024-09-04

* Rewrote most of code base

### [0.1.1] - 2024-05-07

* Packaging fix

## [0.1.0] - 2024-05-07

* Initial release
Loading
Loading