Skip to content

Commit 04b9048

Browse files
committed
Revert to using otumat and datajoint.pub
1 parent b08150a commit 04b9048

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARG PY_VER=3.9
22
ARG IMAGE=jupyter/docker-stacks-foundation
33
FROM ${IMAGE}
44
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 && \
66
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/
88
COPY --chown=1000:100 ./datajoint /main/datajoint
99
RUN \
1010
pip install --no-cache-dir /main && \

docker-compose.yaml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,21 @@ services:
3434
timeout: 30s
3535
retries: 5
3636
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"
3750
app:
38-
image: datajoint/datajoint-python:py${PY_VER:-3.8}
51+
image: datajoint/datajoint:py${DJ_VERSION:-latest}
3952
build:
4053
context: .
4154
dockerfile: Dockerfile
@@ -47,13 +60,13 @@ services:
4760
minio:
4861
condition: service_healthy
4962
environment:
50-
- DJ_HOST=db
63+
- DJ_HOST=fakeservices.datajoint.io
5164
- DJ_USER=root
5265
- DJ_PASS=password
53-
- DJ_TEST_HOST=db
66+
- DJ_TEST_HOST=fakeservices.datajoint.io
5467
- DJ_TEST_USER=datajoint
5568
- DJ_TEST_PASSWORD=datajoint
56-
- S3_ENDPOINT=db
69+
- S3_ENDPOINT=fakeservices.datajoint.io
5770
- S3_ACCESS_KEY=datajoint
5871
- S3_SECRET_KEY=datajoint
5972
- S3_BUCKET=datajoint.test

pyproject.toml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ dependencies = [
1212
"pydot",
1313
"minio>=7.0.0",
1414
"matplotlib",
15+
"otumat",
16+
"faker",
1517
"cryptography",
1618
"urllib3"
1719
]
@@ -61,6 +63,12 @@ datajoint = "datajoint.cli:cli"
6163
[tool.setuptools]
6264
packages = ["datajoint"]
6365

66+
[tool.setuptools.package-data]
67+
datajoint = ["datajoint.pub"]
68+
6469
[build-system]
65-
requires = ["setuptools >= 61.0"]
70+
requires = [
71+
"setuptools>=60",
72+
"setuptools-scm>=8.0"
73+
]
6674
build-backend = "setuptools.build_meta"

0 commit comments

Comments
 (0)