From 3d2321fb5a4008d4ece63eee6ad05ac513322e0a Mon Sep 17 00:00:00 2001 From: felix Date: Mon, 2 Dec 2024 08:43:43 +0100 Subject: [PATCH 1/2] test --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c7ae32e8f..b740d8a39e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] python: ["3.10"] steps: - uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e .[tf,viz,html] --upgrade + pip install -e .[tf,viz] --upgrade pip install -e .[testing] - name: Run unittests run: | @@ -44,7 +44,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] python: ["3.10"] steps: - uses: actions/checkout@v4 @@ -61,7 +61,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e .[tf,viz,html] --upgrade + pip install -e .[tf,viz] --upgrade pip install -e .[testing] - name: Run unittests run: | @@ -77,7 +77,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] python: ["3.10"] steps: - uses: actions/checkout@v4 @@ -94,7 +94,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e .[torch,viz,html] --upgrade + pip install -e .[torch,viz] --upgrade pip install -e .[testing] - name: Run unittests From 03d3b0847da5daf417896e8285615c722c3a113e Mon Sep 17 00:00:00 2001 From: felix Date: Mon, 2 Dec 2024 09:07:35 +0100 Subject: [PATCH 2/2] up --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5d35e2fd73..460e4056e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,8 +53,8 @@ dependencies = [ [project.optional-dependencies] tf = [ # cf. https://github.com/mindee/doctr/pull/1461 - "tensorflow[and-cuda]>=2.15.0,<3.0.0; sys_platform != 'darwin'", - "tensorflow>=2.15.0,<3.0.0; sys_platform == 'darwin'", # TensorFlow compatible for macOS + "tensorflow[and-cuda]>=2.15.0,<3.0.0; sys_platform == 'linux'", + "tensorflow>=2.15.0,<3.0.0; sys_platform != 'linux'", # TensorFlow compatible for macOS and Windows "tf-keras>=2.15.0,<3.0.0", # Keep keras 2 compatibility "tf2onnx>=1.16.0,<2.0.0", # cf. https://github.com/onnx/tensorflow-onnx/releases/tag/v1.16.0 ] @@ -98,8 +98,8 @@ docs = [ dev = [ # Tensorflow # cf. https://github.com/mindee/doctr/pull/1461 - "tensorflow[and-cuda]>=2.15.0,<3.0.0; sys_platform != 'darwin'", - "tensorflow>=2.15.0,<3.0.0; sys_platform == 'darwin'", # TensorFlow compatible for macOS + "tensorflow[and-cuda]>=2.15.0,<3.0.0; sys_platform == 'linux'", + "tensorflow>=2.15.0,<3.0.0; sys_platform != 'linux'", # TensorFlow compatible for macOS and Windows "tf-keras>=2.15.0,<3.0.0", # Keep keras 2 compatibility "tf2onnx>=1.16.0,<2.0.0", # cf. https://github.com/onnx/tensorflow-onnx/releases/tag/v1.16.0 # PyTorch