Skip to content

Commit

Permalink
Minor fixes (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
johentsch authored Sep 26, 2024
2 parents 16ebbf3 + 06dad93 commit 8847612
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 108 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude: '^docs/conf.py'

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: check-added-large-files
Expand Down Expand Up @@ -40,13 +40,13 @@ repos:
hooks:
- id: seed-isort-config
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]

- repo: https://github.com/ambv/black
rev: 23.7.0
rev: 24.8.0
hooks:
- id: black
language_version: python3.10
Expand All @@ -59,7 +59,7 @@ repos:
# additional_dependencies: [black]

- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
rev: 7.1.1
hooks:
- id: flake8
args:
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ install_requires =
frictionless[pandas,visidata]
lxml
pandas>=1.5.3
numpy<2.0.0
pathos
webcolors
tqdm
Expand Down
2 changes: 1 addition & 1 deletion src/ms3/bs4_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ def get_raw_labels(self):
columns={v: k for k, v in cols.items() if v in df.columns}, inplace=True
)
if "harmony_layer" in df.columns:
df.harmony_layer.fillna(0, inplace=True)
df.harmony_layer = df.harmony_layer.fillna(0)
columns = [c for c in main_cols if c in df.columns]
additional_cols = {
c: c[8:]
Expand Down
4 changes: 2 additions & 2 deletions src/ms3/expand_dcml.py
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,9 @@ def propagate_keys(
logger.info(
"Dataframe needs to have a 'mc' column. Ignoring volta_structure."
)
df[localkey].ffill(inplace=True)
df[localkey] = df[localkey].ffill()
else:
df[localkey].ffill(inplace=True)
df[localkey] = df[localkey].ffill()

if add_bool:
gm = f"{globalkey}_is_minor"
Expand Down
Loading

0 comments on commit 8847612

Please sign in to comment.