Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #1823 on branch 0.8.x (Revert change breaking sqlalchemy 1.4.x) #1825

Merged
Merged
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
5 changes: 2 additions & 3 deletions nbgrader/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
DateTime, Interval, Float, Enum, UniqueConstraint,
Boolean, inspect, text)
from sqlalchemy.orm import (sessionmaker, scoped_session, relationship,
column_property, DeclarativeBase)
column_property, declarative_base)
from sqlalchemy.orm.exc import NoResultFound, FlushError
from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy.exc import IntegrityError, StatementError
Expand All @@ -25,8 +25,7 @@
from .auth import Authenticator


class Base(DeclarativeBase):
pass
Base = declarative_base()


def new_uuid() -> str:
Expand Down
Loading