Skip to content

Commit b45d4ad

Browse files
committed
Fix 'Pyteomics' imports for windows
1 parent 330ccb3 commit b45d4ad

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

beams/annotation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import pandas as pd
1212
import numpy as np
1313
import networkx as nx
14-
import pyteomics
14+
from pyteomics import mass as pyteomics_mass
1515
from beams.in_out import read_molecular_formulae
1616
from beams.in_out import read_compounds
1717
from beams.auxiliary import nist_database_to_pyteomics
@@ -873,10 +873,10 @@ def annotate_drug_products(peaklist, db_out, list_smiles, lib_adducts, ppm, phas
873873
mf = Chem.rdMolDescriptors.CalcMolFormula(Chem.MolFromSmiles(smiles_product))
874874
record["smiles"] = smiles_product
875875
record["sygma_score"] = entry['SyGMa_score']
876-
comp = pyteomics.mass.Composition(mf)
876+
comp = pyteomics_mass.Composition(mf)
877877
record.update(comp)
878878
record["molecular_formula"] = composition_to_string(comp)
879-
record["exact_mass"] = round(pyteomics.mass.calculate_mass(formula=str(mf), mass_data=nist_db), 6)
879+
record["exact_mass"] = round(pyteomics_mass.calculate_mass(formula=str(mf), mass_data=nist_db), 6)
880880
record["CHNOPS"] = sum([comp[e] for e in comp if e in ["C", "H", "N", "O", "P", "S"]]) == sum(list(comp.values()))
881881
records.append(record)
882882

beams/auxiliary.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/python
22
# -*- coding: utf-8 -*-
33

4-
import os
5-
import copy
64
from collections import OrderedDict
7-
from pandas import read_csv
8-
import pyteomics
5+
from pyteomics import mass as pyteomics_mass
96
from beams.db_parsers import parse_nist_database
107

118

@@ -45,7 +42,7 @@ def double_bond_equivalents(composition):
4542

4643
def HC_HNOPS_rules(molecular_formula):
4744

48-
composition = pyteomics.mass.Composition(molecular_formula)
45+
composition = pyteomics_mass.Composition(molecular_formula)
4946

5047
rules = {"HC": 0, "NOPSC": 0}
5148

@@ -85,7 +82,7 @@ def lewis_senior_rules(molecular_formula):
8582

8683
valence = {'C': 4, 'H': 1, 'N': 3, 'O': 2, 'P': 3, 'S': 2}
8784

88-
composition = pyteomics.mass.Composition(molecular_formula)
85+
composition = pyteomics_mass.Composition(molecular_formula)
8986

9087
rules = {"lewis": 0, "senior": 0}
9188

0 commit comments

Comments
 (0)