Merge branch 'master' into drop-py37

Author: fantix

.github/workflows/install-edgedb.sh

@@ -5,15 +5,20 @@ shopt -s nullglob
 
 srv="https://packages.edgedb.com"
 
-curl -fL "${srv}/dist/x86_64-unknown-linux-musl/edgedb-cli" \
-    > "/usr/local/bin/edgedb"
+curl -fL "${srv}/dist/$(uname -m)-unknown-linux-musl/edgedb-cli" \
+    > "/usr/bin/edgedb"
 
-chmod +x "/usr/local/bin/edgedb"
+chmod +x "/usr/bin/edgedb"
 
-useradd --shell /bin/bash edgedb
+if command -v useradd >/dev/null 2>&1; then
+    useradd --shell /bin/bash edgedb
+else
+    # musllinux/alpine doesn't have useradd
+    adduser -s /bin/bash -D edgedb
+fi
 
 su -l edgedb -c "edgedb server install"
 ln -s $(su -l edgedb -c "edgedb server info --latest --bin-path") \
-    "/usr/local/bin/edgedb-server"
+    "/usr/bin/edgedb-server"
 
 edgedb-server --version

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
         mkdir -p dist/
         echo "${VERSION}" > dist/VERSION
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/
@@ -52,7 +52,7 @@ jobs:
       PIP_DISABLE_PIP_VERSION_CHECK: 1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
         submodules: true
@@ -65,19 +65,41 @@ jobs:
         pip install -U setuptools wheel pip
         python setup.py sdist
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/*.tar.*
 
-  build-wheels:
+  build-wheels-matrix:
     needs: validate-release-request
+    runs-on: ubuntu-latest
+    outputs:
+      include: ${{ steps.set-matrix.outputs.include }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - run: pip install cibuildwheel==2.12.3
+      - id: set-matrix
+        # Cannot test on Musl distros yet.
+        run: |
+          MATRIX_INCLUDE=$(
+            {
+              cibuildwheel --print-build-identifiers --platform linux --arch x86_64,aarch64 | grep cp | grep many |  jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \
+              && cibuildwheel --print-build-identifiers --platform macos --arch x86_64,arm64 | grep cp |  jq -nRc '{"only": inputs, "os": "macos-latest"}' \
+              && cibuildwheel --print-build-identifiers --platform windows --arch AMD64 | grep cp |  jq -nRc '{"only": inputs, "os": "windows-2019"}'
+            } | jq -sc
+          )
+          echo "include=$MATRIX_INCLUDE" >> $GITHUB_OUTPUT
+  build-wheels:
+    needs: build-wheels-matrix
     runs-on: ${{ matrix.os }}
+    name: Build ${{ matrix.only }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-2019]
-        cibw_python: ["cp37-*", "cp38-*", "cp39-*", "cp310-*"]
-        cibw_arch: ["auto64"]
+        include: ${{ fromJson(needs.build-wheels-matrix.outputs.include) }}
 
     defaults:
       run:
@@ -87,32 +109,32 @@ jobs:
       PIP_DISABLE_PIP_VERSION_CHECK: 1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
         submodules: true
 
     - name: Setup WSL
-      if: ${{ steps.release.outputs.version == 0 && matrix.os == 'windows-2019' }}
-      uses: vampire/setup-wsl@v1
+      if: ${{ matrix.os == 'windows-2019' }}
+      uses: vampire/setup-wsl@v2
       with:
         wsl-shell-user: edgedb
         additional-packages:
           ca-certificates
           curl
 
+    - name: Set up QEMU
+      if: runner.os == 'Linux'
+      uses: docker/setup-qemu-action@v2
+
     - name: Install EdgeDB
       uses: edgedb/setup-edgedb@v1
 
-    - uses: pypa/[email protected]
+    - uses: pypa/[email protected]
+      with:
+          only: ${{ matrix.only }}
       env:
         CIBW_BUILD_VERBOSITY: 1
-        CIBW_BUILD: ${{ matrix.cibw_python }}
-        # Cannot test on Musl distros yet.
-        CIBW_SKIP: "*-musllinux*"
-        CIBW_ARCHS: ${{ matrix.cibw_arch }}
-        # EdgeDB doesn't run on CentOS 6, so use 2014 as baseline
-        CIBW_MANYLINUX_X86_64_IMAGE: "quay.io/pypa/manylinux2014_x86_64"
         CIBW_BEFORE_ALL_LINUX: >
           .github/workflows/install-edgedb.sh
         CIBW_TEST_EXTRAS: "test"
@@ -126,7 +148,7 @@ jobs:
           && chmod -R go+rX "$(dirname $(dirname $(dirname $PY)))"
           && su -l edgedb -c "EDGEDB_PYTHON_TEST_CODEGEN_CMD=$CODEGEN $PY {project}/tests/__init__.py"
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: dist
         path: wheelhouse/*.whl
@@ -136,12 +158,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 5
         submodules: false
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist/

edgedb/_testbase.py

@@ -135,7 +135,7 @@ def _start_cluster(*, cleanup_atexit=True):
             stderr=subprocess.STDOUT,
         )
 
-        for _ in range(250):
+        for _ in range(600):
             try:
                 with open(status_file, 'rb') as f:
                     for line in f:
@@ -171,6 +171,11 @@ def _start_cluster(*, cleanup_atexit=True):
 
         client = edgedb.create_client(password='test', **con_args)
         client.ensure_connected()
+        client.execute("""
+            # Set session_idle_transaction_timeout to 5 minutes.
+            CONFIGURE INSTANCE SET session_idle_transaction_timeout :=
+                <duration>'5 minutes';
+        """)
         _default_cluster = {
             'proc': p,
             'client': client,

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

setup.py

@@ -285,7 +285,7 @@ def finalize_options(self):
     author_email='[email protected]',
     url='https://github.com/edgedb/edgedb-python',
     license='Apache License, Version 2.0',
-    packages=['edgedb'],
+    packages=setuptools.find_packages(),
     provides=['edgedb'],
     zip_safe=False,
     include_package_data=True,
@@ -335,6 +335,7 @@ def finalize_options(self):
     ],
     cmdclass={'build_ext': build_ext},
     test_suite='tests.suite',
+    python_requires=">=3.7",
     install_requires=[
         'certifi>=2021.5.30; platform_system == "Windows"',
     ],