Deprecate fakeservices.datajoint.io in testing

Author: ethho

.github/workflows/development.yaml

@@ -221,7 +221,7 @@ jobs:
       - name: Publish pip release
         run: |
           export HOST_UID=$(id -u)
-          docker compose run \
+          docker compose run --build \
             -e TWINE_USERNAME=${TWINE_USERNAME} -e TWINE_PASSWORD=${TWINE_PASSWORD} app \
             sh -c "pip install twine && python -m twine upload dist/*"
       - name: Login to DockerHub

docker-compose.yaml

@@ -1,4 +1,4 @@
-# DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) docker compose up --exit-code-from app --build
+# DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) docker compose --profile test up --build --exit-code-from djtest djtest
 services:
   db:
     image: datajoint/mysql:${MYSQL_VER:-8.0}
@@ -34,21 +34,8 @@ services:
       timeout: 30s
       retries: 5
       interval: 15s
-  fakeservices.datajoint.io:
-    image: datajoint/nginx:latest
-    environment:
-      - ADD_db_TYPE=DATABASE
-      - ADD_db_ENDPOINT=db:3306
-      - ADD_minio_TYPE=MINIO
-      - ADD_minio_ENDPOINT=minio:9000
-      - ADD_minio_PORT=80 # allow unencrypted connections
-      - ADD_minio_PREFIX=/datajoint
-    # ports:
-    #   - "80:80"
-    #   - "443:443"
-    #   - "3306:3306"
   app:
-    image: datajoint/datajoint:py${DJ_VERSION:-latest}
+    image: datajoint/datajoint:${DJ_VERSION:-latest}
     build:
       context: .
       dockerfile: Dockerfile
@@ -60,13 +47,13 @@ services:
       minio:
         condition: service_healthy
     environment:
-      - DJ_HOST=fakeservices.datajoint.io
+      - DJ_HOST=db
       - DJ_USER=root
       - DJ_PASS=password
-      - DJ_TEST_HOST=fakeservices.datajoint.io
+      - DJ_TEST_HOST=db
       - DJ_TEST_USER=datajoint
       - DJ_TEST_PASSWORD=datajoint
-      - S3_ENDPOINT=fakeservices.datajoint.io
+      - S3_ENDPOINT=minio:9000
       - S3_ACCESS_KEY=datajoint
       - S3_SECRET_KEY=datajoint
       - S3_BUCKET=datajoint.test
@@ -75,6 +62,8 @@ services:
     working_dir: /src
     volumes:
       - .:/src
+    # tty: true
+    # stdin_open: true
   djtest:
     extends:
       service: app
@@ -84,7 +73,7 @@ services:
       - -c
       - |
         set -e
-        pip install -e ".[test]"
-        pip show datajoint
-        pytest -sv --cov-report term-missing --cov=datajoint tests
+        pip install -q -e ".[test]"
+        pip freeze | grep datajoint
+        pytest --cov-report term-missing --cov=datajoint tests
 

tests/conftest.py

@@ -195,7 +195,7 @@ def connection_test(connection_root, prefix, db_creds_test):
 @pytest.fixture(scope="session")
 def s3_creds() -> Dict:
     return dict(
-        endpoint=os.environ.get("S3_ENDPOINT", "fakeservices.datajoint.io"),
+        endpoint=os.environ.get("S3_ENDPOINT", "minio:9000"),
         access_key=os.environ.get("S3_ACCESS_KEY", "datajoint"),
         secret_key=os.environ.get("S3_SECRET_KEY", "datajoint"),
         bucket=os.environ.get("S3_BUCKET", "datajoint.test"),
@@ -425,14 +425,13 @@ def http_client():
 
 
 @pytest.fixture(scope="session")
-def minio_client_bare(s3_creds, http_client):
+def minio_client_bare(s3_creds):
     """Initialize MinIO with an endpoint and access/secret keys."""
     client = minio.Minio(
-        s3_creds["endpoint"],
+        endpoint=s3_creds["endpoint"],
         access_key=s3_creds["access_key"],
         secret_key=s3_creds["secret_key"],
-        secure=True,
-        http_client=http_client,
+        secure=False,
     )
     return client