Update testing image from pydev to djtest

.github/workflows/development.yaml

@@ -31,12 +31,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.8"]
+        # py_ver: ["3.10"]
+        py_ver: ["3.9"]
         mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.7"
+          # - py_ver: "3.9"
+          #   mysql_ver: "5.7"
+          - py_ver: "3.8"
             mysql_ver: "5.7"
-          - py_ver: "3.6"
+          - py_ver: "3.7"
             mysql_ver: "5.7"
     steps:
       - uses: actions/checkout@v2
@@ -52,15 +55,13 @@ jobs:
         run: flake8 datajoint --count --select=E9,F63,F7,F82 --show-source --statistics
       - name: Run primary tests
         env:
-          UID: "1001"
+          HOST_UID: "1001"
           GID: "121"
           PY_VER: ${{matrix.py_ver}}
           MYSQL_VER: ${{matrix.mysql_ver}}
-          ALPINE_VER: "3.10"
+          DISTRO: alpine
           MINIO_VER: RELEASE.2021-09-03T03-56-13Z
           COMPOSE_HTTP_TIMEOUT: "120"
-          COVERALLS_SERVICE_NAME: travis-ci
-          COVERALLS_REPO_TOKEN: fd0BoXG46TPReEem0uMy7BJO5j0w1MQiY
         run: docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
       - name: Run style tests
         run: |

.gitignore

@@ -25,4 +25,4 @@ notebook
 __main__.py
 jupyter_custom.js
 apk_requirements.txt
-.eggs
+.eggs

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Release notes
 
+### 0.13.5 -- TBA
+* Update - Switch testing image from `pydev` to `djtest` PR #1012
+
 ### 0.13.4 -- March, 28 2022
 * Add - Allow reading blobs produced by legacy 32-bit compiled mYm library for matlab. PR #995
 * Bugfix - Add missing `jobs` argument for multiprocessing PR #997

Dockerfile

@@ -1,5 +1,5 @@
-FROM datajoint/pydev
+FROM datajoint/djbase
 
-COPY --chown=dja . /tmp/src
-RUN pip install --user /tmp/src && \
+COPY --chown=anaconda:anaconda . /tmp/src
+RUN pip install --no-cache-dir /tmp/src && \
     rm -rf /tmp/src

LNX-docker-compose.yml

@@ -32,7 +32,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.1.1
+    image: datajoint/nginx:v0.2.0
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
@@ -51,7 +51,7 @@ services:
         condition: service_healthy
   app:
     <<: *net
-    image: datajoint/pydev:${PY_VER}-alpine${ALPINE_VER}
+    image: datajoint/djtest:py${PY_VER}-${DISTRO}
     depends_on:
       fakeservices.datajoint.io:
         condition: service_healthy
@@ -69,26 +69,24 @@ services:
       - PYTHON_USER=dja
       - JUPYTER_PASSWORD=datajoint
       - DISPLAY
-      - COVERALLS_SERVICE_NAME
-      - COVERALLS_REPO_TOKEN
     working_dir: /src
     command:
       - sh
       - -c
       - |
         set -e
-        pip install --user -r test_requirements.txt
+        pip install --user nose nose-cov
         pip install -e .
         pip freeze | grep datajoint
         nosetests -vsw tests --with-coverage --cover-package=datajoint
-        coveralls
         # jupyter notebook
     # ports:
     #   - "8888:8888"
-    user: ${UID}:${GID}
+    user: ${HOST_UID}:anaconda
     volumes:
       - .:/src
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
+      # - ./apk_requirements.txt:/tmp/apk_requirements.txt
       # - ./notebooks:/home/dja/notebooks
 networks:
   main:

README.md

@@ -128,11 +128,11 @@ More details in [docs-api/README.md](docs-api/README.md).
 
 * Create an `.env` with desired development environment values e.g.
 ``` sh
-PY_VER=3.7
-ALPINE_VER=3.10
+PY_VER=3.9
 MYSQL_VER=5.7
-MINIO_VER=RELEASE.2021-09-03T03-56-13Z
-UID=1000
+DISTRO=alpine
+MINIO_VER=RELEASE.2022-01-03T18-22-58Z
+HOST_UID=1000
 GID=1000
 ```
 * `cp local-docker-compose.yml docker-compose.yml`

apk_requirements.txt

@@ -0,0 +1 @@
+make

docs-parts/intro/Releases_lang1.rst

@@ -1,3 +1,7 @@
+0.13.5 -- TBA
+----------------------
+* Update - Switch testing image from `pydev` to `djtest` PR #1012
+
 0.13.4 -- March 28, 2022
 ----------------------
 * Add - Allow reading blobs produced by legacy 32-bit compiled mYm library for matlab. PR #995

local-docker-compose.yml

@@ -34,7 +34,7 @@ services:
       interval: 1s
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.1.1
+    image: datajoint/nginx:v0.2.0
     environment:
     - ADD_db_TYPE=DATABASE
     - ADD_db_ENDPOINT=db:3306
@@ -57,7 +57,7 @@ services:
         condition: service_healthy
   app:
     <<: *net
-    image: datajoint/pydev:${PY_VER}-alpine${ALPINE_VER}
+    image: datajoint/djtest:py${PY_VER}-${DISTRO}
     depends_on:
       fakeservices.datajoint.io:
         condition: service_healthy
@@ -82,7 +82,7 @@ services:
       - -c
       - |
         set -e
-        pip install --user nose nose-cov coveralls flake8 ptvsd black
+        pip install --user nose nose-cov
         pip install -e .
         pip freeze | grep datajoint
         ## You may run the below tests once sh'ed into container i.e. docker exec -it datajoint-python_app_1 sh
@@ -103,7 +103,7 @@ services:
     ports:
       - "8888:8888"
       - "5678:5678"
-    user: ${UID}:${GID}
+    user: ${HOST_UID}:anaconda
     volumes:
       - .:/src
       - /tmp/.X11-unix:/tmp/.X11-unix:rw