diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 3691eca..5398e60 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -5,7 +5,11 @@ name: unit-tests # Controls when the action will run. Triggers the workflow on push or pull request on: push: + branches: + - master pull_request: + branches: + - master # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/bin/run_jest.sh b/bin/run_jest.sh index 860d6f3..ab96372 100755 --- a/bin/run_jest.sh +++ b/bin/run_jest.sh @@ -4,11 +4,16 @@ echo "Running JavaScript tests..." -ROOT_DIR_ABSOLUTE=$(realpath) +ROOT_DIR_ABSOLUTE=$(realpath .) # remove any existing test_js_* directories (from previous runs) rm -rf $ROOT_DIR_ABSOLUTE/test_js_* +# if shopt is available, enable globstar +if command -v shopt >/dev/null 2>&1; then + shopt -s globstar + echo "Enabled globstar in shopt" +fi for file in test/**/test_*.py; do # if there is a .js file in the same directory, skip diff --git a/src/emcommon/metrics/footprint/footprint_calculations.py b/src/emcommon/metrics/footprint/footprint_calculations.py index a43bf68..868e598 100644 --- a/src/emcommon/metrics/footprint/footprint_calculations.py +++ b/src/emcommon/metrics/footprint/footprint_calculations.py @@ -31,10 +31,10 @@ async def calc_footprint_for_trip(trip, label_options, mode_key='mode', mode_val trip['distance'], emcmfu.year_of_trip(trip), trip['start_loc']['coordinates'], - uace=trip.get('uace_region'), - egrid_region=trip.get('egrid_region'), - passengers=rich_mode.get('passengers', 1), - metadata={'trip_id': trip['_id']} + trip.get('uace_region'), + trip.get('egrid_region'), + rich_mode.get('passengers', 1), + {'trip_id': trip['_id']} ) # If is_uncertain, the kwh and kg_co2 values represent the upper bound (worst-case scenario) # Mark them as them uncertain, then set the main values to 0 to represent the lower bound.