Skip to content

Commit

Permalink
Fixes for run_jest.sh on GH Actions and JS compatibility (#11)
Browse files Browse the repository at this point in the history
* fix realpath in run_jest.sh

Although 'realpath' with no argument works on MacOS, it failed in the GH Actions workflow which runs on Ubuntu.
Use `.` for current directory

* don't use keyword args to calc_footprint (for JS compat)

keyword arguments only work properly in Transcrypt if we have the `__kwargs__` pragma enabled on the funtion that accepts them. Since we are giving all the arguments here, it's easy enough to just pass them as positional arguments, eliminating the need for keyword arguments here

* if shopt is available, enable 'globstar' before iterating over ** glob

* only run unit-tests on PRs or pushes to `master`
  • Loading branch information
JGreenlee authored Oct 23, 2024
1 parent 2f4c678 commit 11d727d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion bin/run_jest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/emcommon/metrics/footprint/footprint_calculations.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 11d727d

Please sign in to comment.