Skip to content

Commit 7c394df

Browse files
committed
don't default to remote mode, it breaks the tests - you need to ds.connect() anyway. also - support test dependencies and copy files needed to setup deps in tests
1 parent 8e6f998 commit 7c394df

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Dockerfile.python

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM dotscience-python-base:CI_DOCKER_TAG
22

33
RUN cd dsbuild ; python3 setup.py install
4-
RUN rm -rf dsbuild
4+
#RUN rm -rf dsbuild

Dockerfile.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@ COPY dotscience ./dsbuild/dotscience
88
COPY setup.py ./dsbuild
99
COPY README.md ./dsbuild
1010
COPY LICENSE ./dsbuild
11+
12+
COPY .git ./dsbuild/.git
13+
COPY .gitattributes ./dsbuild
14+
COPY setup.cfg ./dsbuild
15+
COPY MANIFEST.in ./dsbuild
16+
COPY versioneer.py ./dsbuild

dotscience/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,6 @@ def publish(self, description=None, stream=sys.stdout, build=False, deploy=False
320320
self.interactive()
321321
elif runMode == "command":
322322
self.script()
323-
else:
324-
self.remote()
325323
self._check_started()
326324

327325
# end() will set the end timestamp, if the user hasn't already

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ BASE=dotscience-python-test:$CI_DOCKER_TAG
1414

1515
docker build -t $BASE -f Dockerfile.test .
1616

17-
docker run -v dotscience-python-test-examples:/dsbuild/.hypothesis/examples $BASE /bin/bash -c "cd dsbuild ; pytest dotscience $@"
17+
docker run -v dotscience-python-test-examples:/dsbuild/.hypothesis/examples $BASE /bin/bash -c "cd dsbuild ; pip install -e . ; pytest dotscience $@"

0 commit comments

Comments
 (0)