From 8c84fa6c17f013b76d54d6295d0acb75246d393e Mon Sep 17 00:00:00 2001
From: Ruben Verweij <verweij@physics.leidenuniv.nl>
Date: Tue, 4 Jul 2017 10:45:45 +0200
Subject: [PATCH] Fix imports of pims and release 3.0.4

---
 docs                  | 2 +-
 nd2reader/__init__.py | 2 +-
 nd2reader/parser.py   | 2 +-
 nd2reader/reader.py   | 2 +-
 setup.py              | 2 +-
 sphinx/conf.py        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs b/docs
index 459411b..278a1a1 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 459411b242411ac7e15f9f853f1d4014f47d4739
+Subproject commit 278a1a14a5df686eed396b15a0c8e73c13f1e00f
diff --git a/nd2reader/__init__.py b/nd2reader/__init__.py
index f3569c8..ef4d398 100644
--- a/nd2reader/__init__.py
+++ b/nd2reader/__init__.py
@@ -1,4 +1,4 @@
 from nd2reader.reader import ND2Reader
 from nd2reader.legacy import Nd2
 
-__version__ = '3.0.3'
+__version__ = '3.0.4'
diff --git a/nd2reader/parser.py b/nd2reader/parser.py
index 7ff9d6a..6a98152 100644
--- a/nd2reader/parser.py
+++ b/nd2reader/parser.py
@@ -3,7 +3,7 @@ import struct
 
 import array
 import six
-from pims import Frame
+from pims.base_frames import Frame
 import numpy as np
 
 from nd2reader.common import get_version, read_chunk
diff --git a/nd2reader/reader.py b/nd2reader/reader.py
index 2ab2c85..139e2be 100644
--- a/nd2reader/reader.py
+++ b/nd2reader/reader.py
@@ -1,4 +1,4 @@
-from pims import FramesSequenceND, Frame
+from pims.base_frames import FramesSequenceND, Frame
 
 from nd2reader.exceptions import EmptyFileError
 from nd2reader.parser import Parser
diff --git a/setup.py b/setup.py
index 334a222..e91914f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = '3.0.3'
+VERSION = '3.0.4'
 
 if __name__ == '__main__':
     setup(
diff --git a/sphinx/conf.py b/sphinx/conf.py
index d072258..c219a6e 100644
--- a/sphinx/conf.py
+++ b/sphinx/conf.py
@@ -44,9 +44,9 @@ author = 'Ruben Verweij'
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.3'
+version = '3.0.4'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.3'
+release = '3.0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.