From 5dcf630f20cd8f226c75edb6be8ad835a4c3e037 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:17:56 -0500
Subject: [PATCH 01/34] pytest support

---
 .github/workflows/development.yaml | 12 ++++++------
 Dockerfile                         |  6 +++---
 LNX-docker-compose.yml             |  7 ++-----
 README.md                          |  2 +-
 local-docker-compose.yml           |  4 ++--
 test_requirements.txt              |  4 ----
 6 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 test_requirements.txt

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 54829c9b6..02b84701a 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,12 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.8"]
+        py_ver: ["3.10"]
         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
@@ -39,11 +41,9 @@ jobs:
           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: |
diff --git a/Dockerfile b/Dockerfile
index 920f3c75c..f23896e46 100644
--- a/Dockerfile
+++ b/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
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index fedefeee1..2592ffc1f 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -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,19 +69,16 @@ 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 -r nose nose-cov
         pip install -e .
         pip freeze | grep datajoint
         nosetests -vsw tests --with-coverage --cover-package=datajoint
-        coveralls
         # jupyter notebook
     # ports:
     #   - "8888:8888"
diff --git a/README.md b/README.md
index 2dbda209f..1c75ea4ce 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ important DataJoint schema or records.
 * Create an `.env` with desired development environment values e.g.
 ``` sh
 PY_VER=3.7
-ALPINE_VER=3.10
+DISTRO=alpine
 MYSQL_VER=5.7
 MINIO_VER=RELEASE.2021-09-03T03-56-13Z
 UID=1000
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
index 057bec111..b0f69e7ae 100644
--- a/local-docker-compose.yml
+++ b/local-docker-compose.yml
@@ -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
diff --git a/test_requirements.txt b/test_requirements.txt
deleted file mode 100644
index 373bb1a8e..000000000
--- a/test_requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-nose
-nose-cov
-coveralls
-faker
\ No newline at end of file

From c61783470abb67cda02916c0065c292727f8b8bd Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:20:54 -0500
Subject: [PATCH 02/34] disable 3.10 8.0

---
 .github/workflows/development.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 02b84701a..a7138d035 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         py_ver: ["3.10"]
-        mysql_ver: ["8.0", "5.7"]
+        mysql_ver: ["5.7"]
         include:
           - py_ver: "3.9"
             mysql_ver: "5.7"

From 31307958189c24505fdef0c556b08c88dd8bb02e Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:23:47 -0500
Subject: [PATCH 03/34] disable 3.10

---
 .github/workflows/development.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index a7138d035..8ca900416 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.10"]
-        mysql_ver: ["5.7"]
+        # py_ver: ["3.10"]
+        # mysql_ver: ["8.0", "5.7"]
         include:
           - py_ver: "3.9"
             mysql_ver: "5.7"

From 6d550a1f8742d53c01f43db55b829bce1af0e583 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:34:06 -0500
Subject: [PATCH 04/34] re-add coveralls env

---
 .github/workflows/development.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 8ca900416..cca8c26e5 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # py_ver: ["3.10"]
-        # mysql_ver: ["8.0", "5.7"]
+        py_ver: ["3.10"]
+        mysql_ver: ["8.0", "5.7"]
         include:
           - py_ver: "3.9"
             mysql_ver: "5.7"
@@ -44,6 +44,8 @@ jobs:
           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: |

From 0f04ebc512faf6639a7ad5e12feb9ebbddc2f89b Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:36:24 -0500
Subject: [PATCH 05/34] disable 3.10, 3.9

---
 .github/workflows/development.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index cca8c26e5..349c86412 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.10"]
-        mysql_ver: ["8.0", "5.7"]
+        # py_ver: ["3.10"]
+        # mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.9"
-            mysql_ver: "5.7"
+          # - py_ver: "3.9"
+          #   mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From d5778b3bf03dcffadc951cf7e53874dab73f767b Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:40:45 -0500
Subject: [PATCH 06/34] enable 3.10, 3.9

---
 .github/workflows/development.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 349c86412..cca8c26e5 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # py_ver: ["3.10"]
-        # mysql_ver: ["8.0", "5.7"]
+        py_ver: ["3.10"]
+        mysql_ver: ["8.0", "5.7"]
         include:
-          # - py_ver: "3.9"
-          #   mysql_ver: "5.7"
+          - py_ver: "3.9"
+            mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From 360d27c5a9ccd1ad1959791ad8e047d5273a90fb Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:44:06 -0500
Subject: [PATCH 07/34] bump nginx

---
 .github/workflows/development.yaml | 2 --
 LNX-docker-compose.yml             | 2 +-
 local-docker-compose.yml           | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index cca8c26e5..02b84701a 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -44,8 +44,6 @@ jobs:
           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: |
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index 2592ffc1f..d58fde51a 100644
--- a/LNX-docker-compose.yml
+++ b/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
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
index b0f69e7ae..2d654b6ea 100644
--- a/local-docker-compose.yml
+++ b/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

From 25498502c5310b1e24eaa07b5eb1382fde100117 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 13:59:26 -0500
Subject: [PATCH 08/34] revert dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f23896e46..920f3c75c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM datajoint/djbase
+FROM datajoint/pydev
 
-COPY --chown=anaconda:anaconda . /tmp/src
-RUN pip install --no-cache-dir /tmp/src && \
+COPY --chown=dja . /tmp/src
+RUN pip install --user /tmp/src && \
     rm -rf /tmp/src

From a34c61a06ae4e95bf11419d89578e1a6d535f1d6 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:01:58 -0500
Subject: [PATCH 09/34] dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 920f3c75c..f23896e46 100644
--- a/Dockerfile
+++ b/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

From a3010d5806a824a9dc34a02af5fcd6115beb3b5e Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:06:24 -0500
Subject: [PATCH 10/34] check with pydev

---
 LNX-docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index d58fde51a..983583216 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -51,7 +51,7 @@ services:
         condition: service_healthy
   app:
     <<: *net
-    image: datajoint/djtest:py${PY_VER}-${DISTRO}
+    image: datajoint/pydev:${PY_VER}-alpine3.10
     depends_on:
       fakeservices.datajoint.io:
         condition: service_healthy

From ee495871a8d27de9332d807cb5848c14b9bad6fc Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:07:42 -0500
Subject: [PATCH 11/34] disable 3.10,3.9

---
 .github/workflows/development.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 02b84701a..e32678d27 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.10"]
-        mysql_ver: ["8.0", "5.7"]
+        # py_ver: ["3.10"]
+        # mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.9"
-            mysql_ver: "5.7"
+          # - py_ver: "3.9"
+          #   mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From 903b088998d9def829aabb026b21234afcab452a Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:10:11 -0500
Subject: [PATCH 12/34] idk

---
 .github/workflows/development.yaml | 8 ++++----
 LNX-docker-compose.yml             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index e32678d27..02b84701a 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # py_ver: ["3.10"]
-        # mysql_ver: ["8.0", "5.7"]
+        py_ver: ["3.10"]
+        mysql_ver: ["8.0", "5.7"]
         include:
-          # - py_ver: "3.9"
-          #   mysql_ver: "5.7"
+          - py_ver: "3.9"
+            mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index 983583216..d58fde51a 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -51,7 +51,7 @@ services:
         condition: service_healthy
   app:
     <<: *net
-    image: datajoint/pydev:${PY_VER}-alpine3.10
+    image: datajoint/djtest:py${PY_VER}-${DISTRO}
     depends_on:
       fakeservices.datajoint.io:
         condition: service_healthy

From 0429987daa70dd801a77e8df478e3cf503f9ee09 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:50:50 -0500
Subject: [PATCH 13/34] bump minio?

---
 .github/workflows/development.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 02b84701a..ef634180f 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -42,7 +42,7 @@ jobs:
           PY_VER: ${{matrix.py_ver}}
           MYSQL_VER: ${{matrix.mysql_ver}}
           DISTRO: alpine
-          MINIO_VER: RELEASE.2021-09-03T03-56-13Z
+          MINIO_VER: RELEASE.2022-04-12T06-55-35Z
           COMPOSE_HTTP_TIMEOUT: "120"
         run: docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
       - name: Run style tests

From 4cf592f9ec3adaae230789a3403c8157e483f894 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 14:53:34 -0500
Subject: [PATCH 14/34] revert mminio

---
 .github/workflows/development.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index ef634180f..02b84701a 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -42,7 +42,7 @@ jobs:
           PY_VER: ${{matrix.py_ver}}
           MYSQL_VER: ${{matrix.mysql_ver}}
           DISTRO: alpine
-          MINIO_VER: RELEASE.2022-04-12T06-55-35Z
+          MINIO_VER: RELEASE.2021-09-03T03-56-13Z
           COMPOSE_HTTP_TIMEOUT: "120"
         run: docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
       - name: Run style tests

From 7c580d21b709f370676351d5bec4d28a29782a26 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Tue, 12 Apr 2022 17:52:11 -0500
Subject: [PATCH 15/34] fix host uid

---
 .github/workflows/development.yaml | 2 +-
 LNX-docker-compose.yml             | 2 +-
 local-docker-compose.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 02b84701a..732a37bbf 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -37,7 +37,7 @@ 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}}
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index d58fde51a..cc5ff8441 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -82,7 +82,7 @@ services:
         # jupyter notebook
     # ports:
     #   - "8888:8888"
-    user: ${UID}:${GID}
+    user: ${HOST_UID}:anaconda
     volumes:
       - .:/src
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
index 2d654b6ea..9c3198e6a 100644
--- a/local-docker-compose.yml
+++ b/local-docker-compose.yml
@@ -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

From f079bf2f7ae4b6581f0e25dc8814640a169a746c Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 13 Apr 2022 09:35:38 -0500
Subject: [PATCH 16/34] remove -r flag

---
 LNX-docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index cc5ff8441..8740e2041 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -75,7 +75,7 @@ services:
       - -c
       - |
         set -e
-        pip install --user -r nose nose-cov
+        pip install --user nose nose-cov
         pip install -e .
         pip freeze | grep datajoint
         nosetests -vsw tests --with-coverage --cover-package=datajoint

From 99f30104a0b0bfd573bb7881f0738e97d89a609e Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Fri, 15 Apr 2022 10:18:46 -0500
Subject: [PATCH 17/34] add git to apk reqs

---
 .gitignore             | 1 -
 LNX-docker-compose.yml | 1 +
 apk_requirements.txt   | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 apk_requirements.txt

diff --git a/.gitignore b/.gitignore
index 7b6b58d7d..33cde6141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,4 @@ notebook
 .vscode
 __main__.py
 jupyter_custom.js
-apk_requirements.txt
 .eggs
\ No newline at end of file
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index 8740e2041..e8646c726 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -85,6 +85,7 @@ services:
     user: ${HOST_UID}:anaconda
     volumes:
       - .:/src
+      - ./apk_requirements.txt:/tmp/apk_requirements.txt
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
       # - ./notebooks:/home/dja/notebooks
 networks:
diff --git a/apk_requirements.txt b/apk_requirements.txt
new file mode 100644
index 000000000..af5435c13
--- /dev/null
+++ b/apk_requirements.txt
@@ -0,0 +1,2 @@
+make
+git
\ No newline at end of file

From ca980500188470c8bccdfc0686ba5dd2df46cc64 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:13:35 -0500
Subject: [PATCH 18/34] remove git from apk requirements

---
 .gitignore             | 3 ++-
 LNX-docker-compose.yml | 2 +-
 apk_requirements.txt   | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 33cde6141..877c5f614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ notebook
 .vscode
 __main__.py
 jupyter_custom.js
-.eggs
\ No newline at end of file
+apk_requirements.txt
+.eggs
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index e8646c726..a8ee96c1b 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -85,8 +85,8 @@ services:
     user: ${HOST_UID}:anaconda
     volumes:
       - .:/src
-      - ./apk_requirements.txt:/tmp/apk_requirements.txt
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
+      # - ./apk_requirements.txt:/tmp/apk_requirements.txt
       # - ./notebooks:/home/dja/notebooks
 networks:
   main:
diff --git a/apk_requirements.txt b/apk_requirements.txt
index af5435c13..ac08cdcf9 100644
--- a/apk_requirements.txt
+++ b/apk_requirements.txt
@@ -1,2 +1 @@
-make
-git
\ No newline at end of file
+make
\ No newline at end of file

From fdf35c3d224892af0be4ce3ef98e88d685789f38 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:14:49 -0500
Subject: [PATCH 19/34] comment out 3.10 check

---
 .github/workflows/development.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 732a37bbf..9a04ab363 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.10"]
-        mysql_ver: ["8.0", "5.7"]
+        # py_ver: ["3.10"]
+        # mysql_ver: ["8.0", "5.7"]
         include:
           - py_ver: "3.9"
-            mysql_ver: "5.7"
+            mysql_ver: ["8.0", "5.7"]
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From fbf6ba14c9f7dfa1a2f3ee3b151b41f1fb579e3a Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:17:00 -0500
Subject: [PATCH 20/34] fix workflow

---
 .github/workflows/development.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 9a04ab363..0e2eb70bd 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -16,9 +16,11 @@ jobs:
       matrix:
         # py_ver: ["3.10"]
         # mysql_ver: ["8.0", "5.7"]
+        py_ver: ["3.9"]
+        mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.9"
-            mysql_ver: ["8.0", "5.7"]
+          # - py_ver: "3.9"
+          #   mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From 4c55712f27378dca3b2aeb353652614d6622cbc6 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:18:05 -0500
Subject: [PATCH 21/34] cleanup workflow

---
 .github/workflows/development.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 0e2eb70bd..47a6e44bc 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -15,7 +15,6 @@ jobs:
     strategy:
       matrix:
         # py_ver: ["3.10"]
-        # mysql_ver: ["8.0", "5.7"]
         py_ver: ["3.9"]
         mysql_ver: ["8.0", "5.7"]
         include:

From dee6a9830a1631351af0a62c323a44bfc5c7f969 Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:25:00 -0500
Subject: [PATCH 22/34] update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1c75ea4ce..0d0877601 100644
--- a/README.md
+++ b/README.md
@@ -109,11 +109,11 @@ important DataJoint schema or records.
 
 * Create an `.env` with desired development environment values e.g.
 ``` sh
-PY_VER=3.7
-DISTRO=alpine
+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`

From dad27e7e4a31d3235d7b86412592f0ca7f458c2a Mon Sep 17 00:00:00 2001
From: A-Baji <bidabaji@gmail.com>
Date: Wed, 20 Apr 2022 10:28:46 -0500
Subject: [PATCH 23/34] docs

---
 CHANGELOG.md                        | 3 +++
 docs-parts/intro/Releases_lang1.rst | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 029853156..af2e47a3d 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/docs-parts/intro/Releases_lang1.rst b/docs-parts/intro/Releases_lang1.rst
index 997f0eab2..9d68c9a2a 100644
--- a/docs-parts/intro/Releases_lang1.rst
+++ b/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

From 2c433fd69ef2deaa0ee11381e38a0a6e10a8371e Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Fri, 3 Feb 2023 18:02:20 -0600
Subject: [PATCH 24/34] Update GHA.

---
 .github/workflows/development.yaml | 22 ++++++++++++----------
 .gitignore                         |  1 -
 Dockerfile                         | 14 +++++++++-----
 LNX-docker-compose.yml             |  9 ++++-----
 apk_requirements.txt               |  1 -
 docker-compose-build.yaml          |  4 ++--
 local-docker-compose.yml           | 10 ++++------
 7 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 apk_requirements.txt

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 4177afcee..91a3a6641 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -28,7 +28,7 @@ jobs:
       DOCKER_CLIENT_TIMEOUT: "120"
       COMPOSE_HTTP_TIMEOUT: "120"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Validate version and release notes
         run: |
           DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py)
@@ -46,7 +46,7 @@ jobs:
           echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
       - if: matrix.py_ver == '3.8' && matrix.distro == 'alpine'
         name: Add pip artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pip-datajoint-${{env.DJ_VERSION}}
           path: dist
@@ -55,18 +55,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # py_ver: ["3.10"]
-        py_ver: ["3.9"]
+        py_ver: ["3.11"]
         mysql_ver: ["8.0", "5.7"]
         include:
-          # - py_ver: "3.9"
-          #   mysql_ver: "5.7"
+          - py_ver: "3.10"
+            mysql_ver: "5.7"
+          - py_ver: "3.9"
+            mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"
             mysql_ver: "5.7"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{matrix.py_ver}}
         uses: actions/setup-python@v4
         with:
@@ -83,6 +84,7 @@ jobs:
           MYSQL_VER: ${{matrix.mysql_ver}}
           DISTRO: alpine
           MINIO_VER: RELEASE.2021-09-03T03-56-13Z
+          DOCKER_CLIENT_TIMEOUT: "120"
           COMPOSE_HTTP_TIMEOUT: "120"
         run: |
           export HOST_UID=$(id -u)
@@ -103,7 +105,7 @@ jobs:
       DOCKER_CLIENT_TIMEOUT: "120"
       COMPOSE_HTTP_TIMEOUT: "120"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Deploy docs
         run: |
           export MODE=BUILD
@@ -135,7 +137,7 @@ jobs:
     outputs:
       release_upload_url: ${{steps.create_gh_release.outputs.upload_url}}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{matrix.py_ver}}
         uses: actions/setup-python@v4
         with:
@@ -162,7 +164,7 @@ jobs:
           prerelease: false
           draft: false
       - name: Fetch pip artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: pip-datajoint-${{env.DJ_VERSION}}
           path: dist
diff --git a/.gitignore b/.gitignore
index 8eafde557..1c60cd8f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ notebook
 .vscode
 __main__.py
 jupyter_custom.js
-apk_requirements.txt
 .eggs
 *.code-workspace
 docs/site
diff --git a/Dockerfile b/Dockerfile
index f23896e46..71e855de5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,9 @@
-FROM datajoint/djbase
-
-COPY --chown=anaconda:anaconda . /tmp/src
-RUN pip install --no-cache-dir /tmp/src && \
-    rm -rf /tmp/src
+ARG IMAGE
+ARG PY_VER
+ARG DISTRO
+FROM datajoint/${IMAGE}:py${PY_VER}-${DISTRO}
+COPY --chown=anaconda:anaconda ./setup.py ./datajoint.pub ./requirements.txt /main/
+COPY --chown=anaconda:anaconda ./datajoint /main/datajoint
+RUN \
+    pip install --no-cache-dir /main && \
+    rm -r /main/*
diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index ea79cc36b..836539334 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -1,12 +1,12 @@
 # docker compose -f LNX-docker-compose.yml --env-file LNX.env up --exit-code-from app --build
-version: '2.2'
+version: '2.4'
 x-net: &net
   networks:
       - main
 services:
   db:
     <<: *net
-    image: datajoint/mysql:$MYSQL_VER
+    image: datajoint/mysql:${MYSQL_VER}
     environment:
       - MYSQL_ROOT_PASSWORD=simple
     # ports:
@@ -15,7 +15,7 @@ services:
     #   - ./mysql/data:/var/lib/mysql
   minio:
     <<: *net
-    image: minio/minio:$MINIO_VER
+    image: minio/minio:${MINIO_VER}
     environment:
       - MINIO_ACCESS_KEY=datajoint
       - MINIO_SECRET_KEY=datajoint
@@ -77,9 +77,8 @@ services:
         set -e
         pip install --user nose nose-cov
         pip install -e .
-        pip freeze | grep datajoint
+        pip list --format=freeze | grep datajoint
         nosetests -vsw tests --with-coverage --cover-package=datajoint
-        # jupyter notebook
     # ports:
     #   - "8888:8888"
     user: ${HOST_UID}:anaconda
diff --git a/apk_requirements.txt b/apk_requirements.txt
deleted file mode 100644
index ac08cdcf9..000000000
--- a/apk_requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-make
\ No newline at end of file
diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
index 557bb6c01..c95ffbab4 100644
--- a/docker-compose-build.yaml
+++ b/docker-compose-build.yaml
@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djbase DISTRO=alpine DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
+# PY_VER=3.10 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
 #
 # Intended for updating dependencies and docker image.
 # Used to build release artifacts.
@@ -17,7 +17,7 @@ services:
       - .:/main
     command:
       - sh
-      - -lc
+      - -c
       - |
         set -e
         rm -R build dist *.egg-info || echo "No prev build"
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
index 06d46f751..760f7ce37 100644
--- a/local-docker-compose.yml
+++ b/local-docker-compose.yml
@@ -1,12 +1,12 @@
 # docker compose -f local-docker-compose.yml --env-file LNX.env up --build
-version: '2.2'
+version: '2.4'
 x-net: &net
   networks:
       - main
 services:
   db:
     <<: *net
-    image: datajoint/mysql:$MYSQL_VER
+    image: datajoint/mysql:${MYSQL_VER}
     environment:
       - MYSQL_ROOT_PASSWORD=simple
     # ports:
@@ -16,7 +16,7 @@ services:
     #   - ./mysql/data:/var/lib/mysql
   minio:
     <<: *net
-    image: minio/minio:$MINIO_VER
+    image: minio/minio:${MINIO_VER}
     environment:
       - MINIO_ACCESS_KEY=datajoint
       - MINIO_SECRET_KEY=datajoint
@@ -84,7 +84,7 @@ services:
         set -e
         pip install --user nose nose-cov
         pip install -e .
-        pip freeze | grep datajoint
+        pip list --format=freeze | grep datajoint
         ## You may run the below tests once sh'ed into container i.e. docker exec -it datajoint-python_app_1 sh
         # nosetests -vsw tests; #run all tests
         # nosetests -vs --tests=tests.test_external_class:test_insert_and_fetch; #run specific basic test
@@ -92,8 +92,6 @@ services:
         # flake8 datajoint --count --select=E9,F63,F7,F82 --show-source --statistics
         # flake8 --ignore=E203,E722,W503 datajoint --count --max-complexity=62 --max-line-length=127 --statistics
         # black datajoint --check -v
-        ## Interactive Jupyter Notebook environment
-        jupyter notebook &
         ## Remote debugger
         set +e
         while true

From 6aa4805ba6745277ba07dce8ba61445fd8842416 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 08:56:39 -0600
Subject: [PATCH 25/34] Remove py311 test since nosetests incompatible.

---
 .github/workflows/development.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 91a3a6641..885c27763 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -18,8 +18,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: 3.8
-            distro: alpine
+          - py_ver: 3.10
+            distro: debian
             image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
@@ -44,7 +44,7 @@ jobs:
           export HOST_UID=$(id -u)
           docker-compose -f docker-compose-build.yaml up --exit-code-from app --build
           echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
-      - if: matrix.py_ver == '3.8' && matrix.distro == 'alpine'
+      - if: matrix.py_ver == '3.10' && matrix.distro == 'debian'
         name: Add pip artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -55,11 +55,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.11"]
+        py_ver: ["3.10"]
         mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.10"
-            mysql_ver: "5.7"
           - py_ver: "3.9"
             mysql_ver: "5.7"
           - py_ver: "3.8"
@@ -123,8 +121,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: 3.8
-            distro: alpine
+          - py_ver: 3.10
+            distro: debian
             image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}

From 9e89f2d12bcff2b3a319ae8e7fe088b6bacae180 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:06:50 -0600
Subject: [PATCH 26/34] Add docker image publish step to DockerHub.

---
 .github/workflows/development.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 885c27763..0a30d4c2c 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -194,3 +194,19 @@ jobs:
           docker-compose -f docker-compose-build.yaml run \
             -e TWINE_USERNAME=${TWINE_USERNAME} -e TWINE_PASSWORD=${TWINE_PASSWORD} app \
             sh -lc "pip install twine && python -m twine upload dist/*"
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{secrets.docker_username}}
+          password: ${{secrets.docker_password}}
+      - name: Publish image
+        run: |
+          IMAGE=$(docker images --filter "reference=datajoint/datajoint*" --format "{{.Repository}}")
+          TAG=$(docker images --filter "reference=datajoint/datajoint*" --format "{{.Tag}}")
+          docker push "${IMAGE}:${TAG}"
+          docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
+          docker push "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
+          [ "$PY_VER" == "3.10" ] && [ "$DISTRO" == "debian" ] \
+                  && docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest" \
+                  && docker push "${IMAGE}:latest" \
+              || echo "skipping 'latest' tag..."

From 086674d4de80a495498654f62844b2f16fe509a6 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:09:43 -0600
Subject: [PATCH 27/34] Adjust comment wording.

---
 docker-compose-build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
index c95ffbab4..214fb586f 100644
--- a/docker-compose-build.yaml
+++ b/docker-compose-build.yaml
@@ -1,6 +1,6 @@
 # PY_VER=3.10 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
 #
-# Intended for updating dependencies and docker image.
+# Intended to update dependencies and docker image.
 # Used to build release artifacts.
 version: "2.4"
 services:

From 3e05cb71e2f9789bbdb71326af9ed297ec603968 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:12:11 -0600
Subject: [PATCH 28/34] Adjust comment wording again.

---
 docker-compose-build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
index 214fb586f..c95ffbab4 100644
--- a/docker-compose-build.yaml
+++ b/docker-compose-build.yaml
@@ -1,6 +1,6 @@
 # PY_VER=3.10 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
 #
-# Intended to update dependencies and docker image.
+# Intended for updating dependencies and docker image.
 # Used to build release artifacts.
 version: "2.4"
 services:

From cc0b7440bd38c3a4cd7b210208063dba41122f70 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:14:54 -0600
Subject: [PATCH 29/34] Fix version parsing.

---
 .github/workflows/development.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index 0a30d4c2c..f15d68791 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: 3.10
+          - py_ver: '3.10'
             distro: debian
             image: djbase
     env:
@@ -121,7 +121,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: 3.10
+          - py_ver: '3.10'
             distro: debian
             image: djbase
     env:

From 659714ed85b5638bf96bae8a7079ae36b0f765f4 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:16:18 -0600
Subject: [PATCH 30/34] Remove py310 test since nosetests doesn't support.

---
 .github/workflows/development.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index f15d68791..bd6718f65 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -55,11 +55,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.10"]
+        py_ver: ["3.9"]
         mysql_ver: ["8.0", "5.7"]
         include:
-          - py_ver: "3.9"
-            mysql_ver: "5.7"
           - py_ver: "3.8"
             mysql_ver: "5.7"
           - py_ver: "3.7"

From 00456daee728d7f24687a4b36c5221bba96bc9fe Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 09:51:26 -0600
Subject: [PATCH 31/34] Fix backward-incompatible numpy change.

---
 .github/workflows/development.yaml | 8 ++++----
 tests/test_blob.py                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index bd6718f65..cc0e4491a 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: '3.10'
+          - py_ver: '3.9'
             distro: debian
             image: djbase
     env:
@@ -44,7 +44,7 @@ jobs:
           export HOST_UID=$(id -u)
           docker-compose -f docker-compose-build.yaml up --exit-code-from app --build
           echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
-      - if: matrix.py_ver == '3.10' && matrix.distro == 'debian'
+      - if: matrix.py_ver == '3.9' && matrix.distro == 'debian'
         name: Add pip artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -119,7 +119,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: '3.10'
+          - py_ver: '3.9'
             distro: debian
             image: djbase
     env:
@@ -204,7 +204,7 @@ jobs:
           docker push "${IMAGE}:${TAG}"
           docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
           docker push "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
-          [ "$PY_VER" == "3.10" ] && [ "$DISTRO" == "debian" ] \
+          [ "$PY_VER" == "3.9" ] && [ "$DISTRO" == "debian" ] \
                   && docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest" \
                   && docker push "${IMAGE}:latest" \
               || echo "skipping 'latest' tag..."
diff --git a/tests/test_blob.py b/tests/test_blob.py
index 9cf5a30a2..9859d8939 100644
--- a/tests/test_blob.py
+++ b/tests/test_blob.py
@@ -166,7 +166,7 @@ def test_recarrays():
 
 
 def test_object_arrays():
-    x = np.array(((1, 2, 3), True))
+    x = np.array(((1, 2, 3), True), dtype='object')
     assert_array_equal(x, unpack(pack(x)), "Object array did not serialize correctly")
 
 

From 0c4ce1603ea45cb904cbf025c4be6d6a5ae6fea8 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 10:00:01 -0600
Subject: [PATCH 32/34] Adjust styling.

---
 LNX-docker-compose.yml    | 1 -
 datajoint/diagram.py      | 2 --
 datajoint/heading.py      | 1 -
 datajoint/settings.py     | 1 -
 docker-compose-build.yaml | 2 +-
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml
index 836539334..bb8736f11 100644
--- a/LNX-docker-compose.yml
+++ b/LNX-docker-compose.yml
@@ -85,7 +85,6 @@ services:
     volumes:
       - .:/src
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
-      # - ./apk_requirements.txt:/tmp/apk_requirements.txt
       # - ./notebooks:/home/dja/notebooks
 networks:
   main:
diff --git a/datajoint/diagram.py b/datajoint/diagram.py
index ab15af50b..9ae9b9e90 100644
--- a/datajoint/diagram.py
+++ b/datajoint/diagram.py
@@ -94,7 +94,6 @@ class Diagram(nx.DiGraph):
         """
 
         def __init__(self, source, context=None):
-
             if isinstance(source, Diagram):
                 # copy constructor
                 self.nodes_to_show = set(source.nodes_to_show)
@@ -302,7 +301,6 @@ def _make_graph(self):
             return graph
 
         def make_dot(self):
-
             graph = self._make_graph()
             graph.nodes()
 
diff --git a/datajoint/heading.py b/datajoint/heading.py
index 6b26611b0..db3b9a3cb 100644
--- a/datajoint/heading.py
+++ b/datajoint/heading.py
@@ -273,7 +273,6 @@ def _init_from_database(self):
 
         # additional attribute properties
         for attr in attributes:
-
             attr.update(
                 in_key=(attr["in_key"] == "PRI"),
                 database=database,
diff --git a/datajoint/settings.py b/datajoint/settings.py
index e19b845b6..08c4ae068 100644
--- a/datajoint/settings.py
+++ b/datajoint/settings.py
@@ -62,7 +62,6 @@
 
 
 class Config(collections.abc.MutableMapping):
-
     instance = None
 
     def __init__(self, *args, **kwargs):
diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
index c95ffbab4..3dc50d4d5 100644
--- a/docker-compose-build.yaml
+++ b/docker-compose-build.yaml
@@ -1,4 +1,4 @@
-# PY_VER=3.10 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
+# PY_VER=3.9 IMAGE=djbase DISTRO=debian DJ_VERSION=$(grep -oP '\d+\.\d+\.\d+' datajoint/version.py) HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from app --build
 #
 # Intended for updating dependencies and docker image.
 # Used to build release artifacts.

From 79e1bd7eaff7f1f8f83ca047dd17f4b84de268f7 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 10:06:18 -0600
Subject: [PATCH 33/34] Fix styling in tests.

---
 tests/schema_adapted.py | 1 -
 tests/test_alter.py     | 1 -
 tests/test_blob.py      | 3 +--
 tests/test_jobs.py      | 1 -
 tests/test_s3.py        | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/schema_adapted.py b/tests/schema_adapted.py
index 8f966b876..ecb7b2ba8 100644
--- a/tests/schema_adapted.py
+++ b/tests/schema_adapted.py
@@ -23,7 +23,6 @@
 
 
 class GraphAdapter(dj.AttributeAdapter):
-
     attribute_type = "longblob"  # this is how the attribute will be declared
 
     @staticmethod
diff --git a/tests/test_alter.py b/tests/test_alter.py
index c234d2bb2..a785ffa28 100644
--- a/tests/test_alter.py
+++ b/tests/test_alter.py
@@ -4,7 +4,6 @@
 
 @schema
 class Experiment(dj.Imported):
-
     original_definition = """  # information about experiments
     -> Subject
     experiment_id  :smallint  # experiment number for this subject
diff --git a/tests/test_blob.py b/tests/test_blob.py
index 9859d8939..35904e4f8 100644
--- a/tests/test_blob.py
+++ b/tests/test_blob.py
@@ -19,7 +19,6 @@
 
 
 def test_pack():
-
     for x in (
         32,
         -3.7e-2,
@@ -166,7 +165,7 @@ def test_recarrays():
 
 
 def test_object_arrays():
-    x = np.array(((1, 2, 3), True), dtype='object')
+    x = np.array(((1, 2, 3), True), dtype="object")
     assert_array_equal(x, unpack(pack(x)), "Object array did not serialize correctly")
 
 
diff --git a/tests/test_jobs.py b/tests/test_jobs.py
index 371b21a2f..21fdef940 100644
--- a/tests/test_jobs.py
+++ b/tests/test_jobs.py
@@ -9,7 +9,6 @@
 
 
 def test_reserve_job():
-
     schema.schema.jobs.delete()
     assert_true(subjects)
     table_name = "fake_table"
diff --git a/tests/test_s3.py b/tests/test_s3.py
index 90449f64f..6f15628e8 100644
--- a/tests/test_s3.py
+++ b/tests/test_s3.py
@@ -12,7 +12,6 @@
 class TestS3:
     @staticmethod
     def test_connection():
-
         # Initialize httpClient with relevant timeout.
         http_client = urllib3.PoolManager(
             timeout=30,
@@ -36,7 +35,6 @@ def test_connection():
 
     @staticmethod
     def test_connection_secure():
-
         # Initialize httpClient with relevant timeout.
         http_client = urllib3.PoolManager(
             timeout=30,

From 7ac30db53b00bba13c9eb4fea3783b4d6f330301 Mon Sep 17 00:00:00 2001
From: guzman-raphael <raphael.h.guzman@gmail.com>
Date: Sat, 4 Feb 2023 10:11:41 -0600
Subject: [PATCH 34/34] Add reasonable defaults for packaging environment.

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71e855de5..59da930a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG IMAGE
-ARG PY_VER
-ARG DISTRO
+ARG IMAGE=djbase
+ARG PY_VER=3.9
+ARG DISTRO=debian
 FROM datajoint/${IMAGE}:py${PY_VER}-${DISTRO}
 COPY --chown=anaconda:anaconda ./setup.py ./datajoint.pub ./requirements.txt /main/
 COPY --chown=anaconda:anaconda ./datajoint /main/datajoint