Skip to content

Commit

Permalink
#187 Merge branch 'development' into 187-tutorial-basic-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
jalew188 committed Jul 17, 2024
2 parents 3e6df63 + bb624c0 commit a62fa94
Show file tree
Hide file tree
Showing 67 changed files with 3,106 additions and 22,680 deletions.
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ repos:
hooks:
- id: ruff-format
- id: ruff
args:
- "--fix"

exclude: .bumpversion.cfg
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

Note: This changelog is deprecated and will no longer be updated. Please refer to the Release changelogs on github.

Follow the changelog format from https://keepachangelog.com/en/1.0.0/.

## 1.1.0 - 2023.xx.xx
Expand Down
1 change: 1 addition & 0 deletions alphabase/constants/_const.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os

import numpy as np

from alphabase.yaml_utils import load_yaml
Expand Down
13 changes: 6 additions & 7 deletions alphabase/constants/aa.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import os
import pandas as pd
import numpy as np
import typing

from alphabase.yaml_utils import load_yaml
import numpy as np
import pandas as pd

from alphabase.constants._const import CONST_FILE_FOLDER
from alphabase.constants.atom import (
calc_mass_from_formula,
MASS_H2O,
calc_mass_from_formula,
parse_formula,
reset_elements,
)

from alphabase.constants._const import CONST_FILE_FOLDER
from alphabase.yaml_utils import load_yaml

# We use all 128 ASCII code to represent amino acids for flexible extensions in the future.
# The amino acid masses are stored in 128-lengh array :py:data:`AA_ASCII_MASS`.
Expand Down Expand Up @@ -70,7 +69,7 @@ def reset_AA_df():
def reset_AA_Composition():
global AA_Composition
AA_Composition = {}
for aa, formula, mass in AA_DF.values:
for aa, formula, _mass in AA_DF.values:
AA_Composition[aa] = dict(parse_formula(formula))
return AA_Composition

Expand Down
6 changes: 3 additions & 3 deletions alphabase/constants/atom.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import os
import numpy as np
import numba
import typing

from alphabase.yaml_utils import load_yaml
import numba
import numpy as np

from alphabase.constants._const import CONST_FILE_FOLDER, common_const_dict
from alphabase.yaml_utils import load_yaml

MASS_PROTON: float = common_const_dict["MASS_PROTON"]
MASS_ISOTOPE: float = common_const_dict["MASS_ISOTOPE"]
Expand Down
Loading

0 comments on commit a62fa94

Please sign in to comment.