Skip to content
This repository has been archived by the owner on Jun 8, 2023. It is now read-only.

Commit

Permalink
use pulsar 2.0 dev
Browse files Browse the repository at this point in the history
  • Loading branch information
lsbardel committed Feb 21, 2017
1 parent 25ee194 commit e7f5ccb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
15 changes: 9 additions & 6 deletions odm/__init__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
'''Object Data Mapper for pulsar asynchronous framework'''
"""Object Data Mapper for pulsar asynchronous framework"""
import os

from .version import get_version


VERSION = (0, 6, 2, 'final', 0)
VERSION = (0, 7, 0, 'alpha', 0)
__version__ = get_version(VERSION, __file__)


if os.environ.get('package_info') != 'odm':

from .mapper import (Model, Mapper, OdmSession, logger, model_base,
BaseModel, table_args, declared_attr, copy_models,
move_models, get_models, ImproperlyConfigured,
module_tables)
from .mapper import (
Model, Mapper, OdmSession, logger, model_base,
BaseModel, table_args, declared_attr, copy_models,
move_models, get_models, ImproperlyConfigured,
module_tables
)
from .strategy import create_engine
from . import dialects

Expand Down
2 changes: 1 addition & 1 deletion odm/mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from sqlalchemy.orm import object_session
from sqlalchemy.schema import DDL

from pulsar import ImproperlyConfigured
from pulsar.api import ImproperlyConfigured

from .strategy import create_engine
from .utils import database_operation
Expand Down
2 changes: 1 addition & 1 deletion odm/types/choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from sqlalchemy import types

from pulsar import ImproperlyConfigured
from pulsar.api import ImproperlyConfigured


class ScalarCoercible(object):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
greenlet
sqlalchemy
psycopg2
pulsar
pulsar >= 2.0.0

0 comments on commit e7f5ccb

Please sign in to comment.