From 1219b63ad629cf4cb919338ad575e1114fa451a5 Mon Sep 17 00:00:00 2001 From: Robert Kuykendall Date: Sat, 8 Apr 2017 18:49:49 -0400 Subject: [PATCH 1/2] Fix circular import. --- marvelous/__init__.py | 2 +- marvelous/series.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/marvelous/__init__.py b/marvelous/__init__.py index 130206a..cc350c5 100644 --- a/marvelous/__init__.py +++ b/marvelous/__init__.py @@ -1,5 +1,5 @@ from . import session, exceptions -from .sqlite_cache import SqliteCache +from .sqlite_cache import SqliteCache # NOQA F401 Imported for export def api(public_key=None, private_key=None, cache=None): diff --git a/marvelous/series.py b/marvelous/series.py index 176684a..15fa8d8 100644 --- a/marvelous/series.py +++ b/marvelous/series.py @@ -1,6 +1,6 @@ from marshmallow import Schema, fields, pre_load, post_load -from . import comics_list, exceptions +from . import exceptions class Series: @@ -12,6 +12,8 @@ def __init__(self, **kwargs): setattr(self, k, v) def comics(self, params=None): + from . import comics_list + if params is None: params = {} From 6c34787d0b9227a00da187a40c1ce77198ee8844 Mon Sep 17 00:00:00 2001 From: Robert Kuykendall Date: Sun, 9 Apr 2017 10:38:07 -0400 Subject: [PATCH 2/2] Increment version # for release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 54ccfbe..49ebd7d 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = '1.0.2' +version = '1.0.3' setup( author_email='robert@rkuykendall.com',