File tree Expand file tree Collapse file tree 3 files changed +28
-7
lines changed Expand file tree Collapse file tree 3 files changed +28
-7
lines changed Original file line number Diff line number Diff line change @@ -2,9 +2,9 @@ ARG PY_VER=3.9
2
2
ARG IMAGE=jupyter/docker-stacks-foundation
3
3
FROM ${IMAGE}
4
4
USER jovyan
5
- RUN conda install -y -n base -c conda-forge python=${PY_VER} && \
5
+ RUN conda install -y -n base -c conda-forge python=${PY_VER} pydot networkx && \
6
6
conda clean -afy
7
- COPY --chown=1000:100 ./pyproject.toml ./README.md ./LICENSE.txt /main/
7
+ COPY --chown=1000:100 ./pyproject.toml ./README.md ./LICENSE.txt ./datajoint.pub /main/
8
8
COPY --chown=1000:100 ./datajoint /main/datajoint
9
9
RUN \
10
10
pip install --no-cache-dir /main && \
Original file line number Diff line number Diff line change @@ -34,8 +34,21 @@ services:
34
34
timeout : 30s
35
35
retries : 5
36
36
interval : 15s
37
+ fakeservices.datajoint.io :
38
+ image : datajoint/nginx:latest
39
+ environment :
40
+ - ADD_db_TYPE=DATABASE
41
+ - ADD_db_ENDPOINT=db:3306
42
+ - ADD_minio_TYPE=MINIO
43
+ - ADD_minio_ENDPOINT=minio:9000
44
+ - ADD_minio_PORT=80 # allow unencrypted connections
45
+ - ADD_minio_PREFIX=/datajoint
46
+ # ports:
47
+ # - "80:80"
48
+ # - "443:443"
49
+ # - "3306:3306"
37
50
app :
38
- image : datajoint/datajoint-python :py${PY_VER:-3.8 }
51
+ image : datajoint/datajoint:py${DJ_VERSION:-latest }
39
52
build :
40
53
context : .
41
54
dockerfile : Dockerfile
@@ -47,13 +60,13 @@ services:
47
60
minio :
48
61
condition : service_healthy
49
62
environment :
50
- - DJ_HOST=db
63
+ - DJ_HOST=fakeservices.datajoint.io
51
64
- DJ_USER=root
52
65
- DJ_PASS=password
53
- - DJ_TEST_HOST=db
66
+ - DJ_TEST_HOST=fakeservices.datajoint.io
54
67
- DJ_TEST_USER=datajoint
55
68
- DJ_TEST_PASSWORD=datajoint
56
- - S3_ENDPOINT=db
69
+ - S3_ENDPOINT=fakeservices.datajoint.io
57
70
- S3_ACCESS_KEY=datajoint
58
71
- S3_SECRET_KEY=datajoint
59
72
- S3_BUCKET=datajoint.test
Original file line number Diff line number Diff line change @@ -12,6 +12,8 @@ dependencies = [
12
12
" pydot" ,
13
13
" minio>=7.0.0" ,
14
14
" matplotlib" ,
15
+ " otumat" ,
16
+ " faker" ,
15
17
" cryptography" ,
16
18
" urllib3"
17
19
]
@@ -61,6 +63,12 @@ datajoint = "datajoint.cli:cli"
61
63
[tool .setuptools ]
62
64
packages = [" datajoint" ]
63
65
66
+ [tool .setuptools .package-data ]
67
+ datajoint = [" datajoint.pub" ]
68
+
64
69
[build-system ]
65
- requires = [" setuptools >= 61.0" ]
70
+ requires = [
71
+ " setuptools>=60" ,
72
+ " setuptools-scm>=8.0"
73
+ ]
66
74
build-backend = " setuptools.build_meta"
You can’t perform that action at this time.
0 commit comments