From 7eb24c188a4d9f3223053f0a18ca2d58d354a6d0 Mon Sep 17 00:00:00 2001 From: Jim Rybarski Date: Sun, 11 Oct 2015 14:09:48 -0500 Subject: [PATCH] fixed installer --- Dockerfile | 1 + functional_tests/FYLM141111001.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e860fd8..f0aab5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,3 +36,4 @@ COPY . /opt/nd2reader WORKDIR /opt/nd2reader RUN python setup.py install RUN python3 setup.py install +WORKDIR /var/nd2s diff --git a/functional_tests/FYLM141111001.py b/functional_tests/FYLM141111001.py index 05764c6..0869398 100644 --- a/functional_tests/FYLM141111001.py +++ b/functional_tests/FYLM141111001.py @@ -10,7 +10,7 @@ import unittest class FunctionalTests(unittest.TestCase): def setUp(self): - self.nd2 = Nd2("/var/nd2s/FYLM-141111-001.nd2") + self.nd2 = Nd2("FYLM-141111-001.nd2") def tearDown(self): self.nd2.close() diff --git a/setup.py b/setup.py index d5feeaa..9364d69 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ VERSION = "1.1.2" setup( name="nd2reader", - packages=['nd2reader', 'nd2reader.model'], + packages=['nd2reader', 'nd2reader.model', 'nd2reader.driver', 'nd2reader.parser', 'nd2reader.common'], install_requires=[ 'numpy>=1.6.2, <2.0', 'six>=1.4, <2.0'