From ac3f1302c1b6d1d3c880529c03d4f45d955d2e92 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Fri, 2 Aug 2024 16:09:07 -0700 Subject: [PATCH 1/4] Remove deprecated `test_suite` kwarg from `setuptools.setup()` --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 27f3aa53..73873448 100644 --- a/setup.py +++ b/setup.py @@ -336,7 +336,6 @@ def finalize_options(self): include_dirs=INCLUDE_DIRS), ], cmdclass={'build_ext': build_ext}, - test_suite='tests.suite', python_requires=">=3.7", install_requires=[ 'typing-extensions>=3.10.0; python_version < "3.8.0"', From 7be5eb31e04ac0134a8b7554ecd9eac7ccd255a2 Mon Sep 17 00:00:00 2001 From: "Michael J. Sullivan" Date: Thu, 5 Oct 2023 21:07:47 -0700 Subject: [PATCH 2/4] Fix test that broke due to error message change (#465) Some error messages were changed in #6209. When I first saw this failing, I was very worried that it was a state bug introduced by --- tests/test_async_query.py | 2 +- tests/test_sync_query.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_async_query.py b/tests/test_async_query.py index 7fade678..796bf87f 100644 --- a/tests/test_async_query.py +++ b/tests/test_async_query.py @@ -1107,7 +1107,7 @@ async def test_dup_link_prop_name(self): ''') async def test_transaction_state(self): - with self.assertRaisesRegex(edgedb.QueryError, "cannot assign to id"): + with self.assertRaisesRegex(edgedb.QueryError, "cannot assign to.*id"): async for tx in self.client.transaction(): async with tx: await tx.execute(''' diff --git a/tests/test_sync_query.py b/tests/test_sync_query.py index 622fceed..79dae829 100644 --- a/tests/test_sync_query.py +++ b/tests/test_sync_query.py @@ -868,7 +868,7 @@ def test_sync_banned_transaction(self): self.client.execute('start transaction') def test_transaction_state(self): - with self.assertRaisesRegex(edgedb.QueryError, "cannot assign to id"): + with self.assertRaisesRegex(edgedb.QueryError, "cannot assign to.*id"): for tx in self.client.transaction(): with tx: tx.execute(''' From 368ed7ace36981e93c3237ceb6ae794ab453a5a3 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Wed, 19 Jun 2024 13:59:59 -0400 Subject: [PATCH 3/4] ci: give repo write permission to the publish job (#505) --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e019fb6..bf51d1bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -156,6 +156,8 @@ jobs: publish: needs: [build-sdist, build-wheels] runs-on: ubuntu-latest + permissions: + contents: write steps: - uses: actions/checkout@v3 From 1127555b524b2c18684de69176b572925e327bf7 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Fri, 2 Aug 2024 16:10:11 -0700 Subject: [PATCH 4/4] edgedb-python v1.6.1 --- .github/workflows/release.yml | 9 ++++++--- edgedb/_version.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf51d1bf..e9e125ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,8 @@ on: branches: - "master" - "ci" - - "[0-9]+.[0-9x]+*" + - "release/[0-9]+.x" + - "release/[0-9]+.[0-9]+.x" paths: - "edgedb/_version.py" @@ -80,9 +81,11 @@ jobs: - uses: actions/setup-python@v4 with: python-version: "3.x" - - run: pip install cibuildwheel==2.12.3 + - run: pip install cibuildwheel==2.19.2 - id: set-matrix # Cannot test on Musl distros yet. + env: + CIBW_SKIP: "cp312-*" run: | MATRIX_INCLUDE=$( { @@ -130,7 +133,7 @@ jobs: - name: Install EdgeDB uses: edgedb/setup-edgedb@v1 - - uses: pypa/cibuildwheel@v2.12.3 + - uses: pypa/cibuildwheel@v2.19.2 with: only: ${{ matrix.only }} env: diff --git a/edgedb/_version.py b/edgedb/_version.py index 620a9a28..101d8e88 100644 --- a/edgedb/_version.py +++ b/edgedb/_version.py @@ -28,4 +28,4 @@ # supported platforms, publish the packages on PyPI, merge the PR # to the target branch, create a Git tag pointing to the commit. -__version__ = '1.6.0' +__version__ = '1.6.1'