Skip to content

Commit

Permalink
Merge branch 'master' of github.com:levitsky/pyteomics
Browse files Browse the repository at this point in the history
  • Loading branch information
levitsky committed Apr 3, 2024
2 parents 940afe2 + 3ac63e0 commit 196c179
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pyteomics/mass/unimod.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
import re

from lxml import etree
from sqlalchemy.ext.declarative import declarative_base, DeclarativeMeta
try:
from sqlalchemy.orm import declarative_base, DeclarativeMeta
except ImportError: # Moved in sqlalchemy 2.0
from sqlalchemy.ext.declarative import declarative_base, DeclarativeMeta
from sqlalchemy.orm import relationship, backref, object_session
from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy import (Numeric, Unicode,
Expand Down

0 comments on commit 196c179

Please sign in to comment.