Fix merge conflicts.

Author: guzman-raphael

.devcontainer/Dockerfile

@@ -0,0 +1,12 @@
+# Note: You can use any Debian/Ubuntu based image you want. 
+FROM mcr.microsoft.com/devcontainers/python:3.7-bullseye
+
+RUN \
+    apt update && \
+    apt-get install bash-completion graphviz default-mysql-client -y && \
+    pip install flake8 black faker ipykernel nose nose-cov datajoint && \
+    pip uninstall datajoint -y
+
+ENV DJ_HOST fakeservices.datajoint.io
+ENV DJ_USER root
+ENV DJ_PASS simple

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+{
+	"name": "Development",
+	"dockerComposeFile": "docker-compose.yaml",
+	"service": "app",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	// Use this environment variable if you need to bind mount your local source code into a new container.
+	"remoteEnv": {
+		"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
+	},
+	// https://containers.dev/features
+	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/devcontainers/features/git:1": {},
+		"ghcr.io/eitsupi/devcontainer-features/jq-likes:1": {},
+		"ghcr.io/guiyomh/features/vim:0": {}
+	},
+	"onCreateCommand": "pip install -e . && MYSQL_VER=5.7 MINIO_VER=RELEASE.2022-08-11T04-37-28Z docker compose -f local-docker-compose.yml up --build -d",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python"
+			]
+		}
+	}
+}

.devcontainer/docker-compose.yaml

@@ -0,0 +1,8 @@
+version: "3"
+services:
+  app:
+    build: .
+    volumes:
+      - ../..:/workspaces:cached
+    entrypoint: /usr/local/share/docker-init.sh
+    command: tail -f /dev/null

.github/workflows/development.yaml

@@ -2,24 +2,24 @@ name: Development
 on:
   push:
     branches:
-      - '**' # every branch
-      - '!gh-pages' # exclude gh-pages branch
-      - '!stage*' # exclude branches beginning with stage
+      - "**" # every branch
+      - "!gh-pages" # exclude gh-pages branch
+      - "!stage*" # exclude branches beginning with stage
     tags:
       - '\d+\.\d+\.\d+' # only semver tags
   pull_request:
     branches:
-      - '**' # every branch
-      - '!gh-pages' # exclude gh-pages branch
-      - '!stage*' # exclude branches beginning with stage
+      - "**" # every branch
+      - "!gh-pages" # exclude gh-pages branch
+      - "!stage*" # exclude branches beginning with stage
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
-          - py_ver: 3.8
-            distro: alpine
+          - py_ver: "3.9"
+            distro: debian
             image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
@@ -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)
@@ -44,9 +44,9 @@ 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.9' && matrix.distro == 'debian'
         name: Add pip artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pip-datajoint-${{env.DJ_VERSION}}
           path: dist
@@ -55,13 +55,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        py_ver: ["3.8"]
+        py_ver: ["3.9"]
         mysql_ver: ["8.0", "5.7"]
         include:
+          - 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:
@@ -75,15 +77,14 @@ jobs:
       - name: Run primary tests
         env:
           PY_VER: ${{matrix.py_ver}}
+          DJ_PASS: simple
           MYSQL_VER: ${{matrix.mysql_ver}}
-          ALPINE_VER: "3.10"
+          DISTRO: alpine
           MINIO_VER: RELEASE.2021-09-03T03-56-13Z
+          DOCKER_CLIENT_TIMEOUT: "120"
           COMPOSE_HTTP_TIMEOUT: "120"
-          COVERALLS_SERVICE_NAME: travis-ci
-          COVERALLS_REPO_TOKEN: fd0BoXG46TPReEem0uMy7BJO5j0w1MQiY
         run: |
           export HOST_UID=$(id -u)
-          export HOST_GID=$(id -g)
           docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
       - name: Run style tests
         run: |
@@ -101,7 +102,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
@@ -119,8 +120,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - py_ver: 3.8
-            distro: alpine
+          - py_ver: "3.9"
+            distro: debian
             image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
@@ -133,7 +134,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:
@@ -160,7 +161,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
@@ -192,3 +193,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.9" ] && [ "$DISTRO" == "debian" ] \
+                  && docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest" \
+                  && docker push "${IMAGE}:latest" \
+              || echo "skipping 'latest' tag..."

.gitignore

@@ -21,9 +21,12 @@ build/
 *.env
 docker-compose.yml
 notebook
-.vscode
 __main__.py
 jupyter_custom.js
 .eggs
 *.code-workspace
-docs/site
+docs/site
+
+
+!.vscode/settings.json
+!.devcontainer/devcontainer.json

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.rulers": [
+        94
+    ],
+    "python.formatting.provider": "black",
+    "[python]": {
+        "editor.defaultFormatter": null
+    }
+}