From e1a02f412cd4502519e55ab9e90b20dc1cf72d45 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 20 Dec 2023 18:27:21 -0500 Subject: [PATCH 1/5] CI: test with bluesky==1.11.0 --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ed94691..3e013a8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -46,6 +46,7 @@ jobs: pip install . pip install -r requirements-dev.txt pip install "pydantic${{ matrix.pydantic-version }}" + pip install bluesky==1.11.0 pip list - name: Test with pytest From 84ba2351f237bc1506a2c9376ae052b7588eaa40 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 20 Dec 2023 18:30:35 -0500 Subject: [PATCH 2/5] CI: add Python v3.12 to the matrix --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 3e013a8..5c4b40b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12"] pydantic-version: ["<2.0.0", ">=2.0.0"] fail-fast: false From 5bb1d573c0bb5efff5319dea9be0d600191e3180 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 20 Dec 2023 18:33:42 -0500 Subject: [PATCH 3/5] CI: tests with Pydantic 1 are called only for Python 11 --- .github/workflows/testing.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5c4b40b..8c84ad2 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,6 +10,14 @@ jobs: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] pydantic-version: ["<2.0.0", ">=2.0.0"] + exclude: + - python-version: "3.9" + pydantic-version: "<2.0.0" + - python-version: "3.10" + pydantic-version: "<2.0.0" + - python-version: "3.12" + pydantic-version: "<2.0.0" + fail-fast: false steps: From 920f97f873ba501f7a659ede809f03f9dac44050 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Sun, 24 Dec 2023 09:33:47 -0500 Subject: [PATCH 4/5] CI: test with Pydantic 1 only on Python 3.10 --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8c84ad2..bc93bbf 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: exclude: - python-version: "3.9" pydantic-version: "<2.0.0" - - python-version: "3.10" + - python-version: "3.11" pydantic-version: "<2.0.0" - python-version: "3.12" pydantic-version: "<2.0.0" From 90067c0d4b7d9a9bb995fb85fd960839fc7038e0 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Sun, 24 Dec 2023 09:57:28 -0500 Subject: [PATCH 5/5] CI: flake8 --- bluesky_httpserver/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluesky_httpserver/tests/conftest.py b/bluesky_httpserver/tests/conftest.py index 785a500..20cba51 100644 --- a/bluesky_httpserver/tests/conftest.py +++ b/bluesky_httpserver/tests/conftest.py @@ -63,7 +63,7 @@ def setup_server_with_config_file(*, config_file_str, tmpdir, monkeypatch): Creates config file for the server in ``tmpdir/config/`` directory and sets up the respective environment variable. Sets ``tmpdir`` as a current directory. """ - print(f"SERVER CONFIGURATION:\n{'-'*50}\n{config_file_str}\n{'-'*50}") + print(f"SERVER CONFIGURATION:\n{'-' * 50}\n{config_file_str}\n{'-' * 50}") config_fln = "config_httpserver.yml" config_dir = os.path.join(tmpdir, "config") config_path = os.path.join(config_dir, config_fln)