Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .github/workflows/lint_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
env:
CF_SKIP_SETUP: "true"
steps:
- name: Checkout ⬇️
uses: actions/checkout@master
Expand Down
1 change: 1 addition & 0 deletions .setups/template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export CF_SCHEDULER_HOST="127.0.0.1"
export CF_SCHEDULER_PORT="8082"
export CF_FLAVOR="cms"
export LAW_CMS_VO="cms"
export CF_SKIP_SETUP="false"

#===== on manivald ==========
export CF_CRAB_STORAGE_ELEMENT="T2_EE_Estonia"
Expand Down
14 changes: 9 additions & 5 deletions bin/githooks/post-commit
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
#!/bin/sh

# Custom post-commit hook that runs the linter.
RED='\033[0;31m'
NC='\033[0m' # No Color

action() {
# just lint
if [ ! -d "${HBT_BASE}" ]; then
>&2 echo "HBT_BASE not setup, skip linting"
elif [ "${HBT_SKIP_POST_COMMIT}" != "1" ]; then
if [ ! -d "${MULTILEPTON_BASE}" ]; then
>&2 echo "MULTILEPTON_BASE not setup, skip linting"
elif [ "${MULTILEPTON_SKIP_POST_COMMIT}" != "1" ]; then
bash "${MULTILEPTON_BASE}/tests/run_linting"
echo "post-commit linting ..."
bash "${HBT_BASE}/tests/run_linting"
echo
echo -e "${RED}⚠️ Linting Issues Found${NC}"
echo "Please resolve the issues above (if there any!) before pushing to the repository."
echo ...
fi

# always end successfully
Expand Down
4 changes: 2 additions & 2 deletions multilepton/config/styles.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

from copy import deepcopy
from collections import defaultdict
from columnflow.util import DotMap, try_int

from columnflow.util import DotDict, try_int

logger = law.logger.get_logger(__name__)

Expand Down Expand Up @@ -110,7 +110,7 @@ def apply_process_styles(config, process_key, process_data, group=None):
return


def stylize_processes(config: od.Config, datasets_cfg: DotMap) -> None:
def stylize_processes(config: od.Config, datasets_cfg: DotDict) -> None:
"""
Applies style and metadata (colors, labels, etc.)
to each process from the datasets YAML.
Expand Down
Loading