From f1b7684efa52bb0025d4095bcad6aa646dfcccc7 Mon Sep 17 00:00:00 2001 From: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:48:13 +0100 Subject: [PATCH] Remove x86 macOS runners from the test suite (#453) * Removed macos-13 from testing * Removed conditional dependencies for x86 macOS --- .github/workflows/test_and_deploy.yml | 4 +--- pyproject.toml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 12e74d3d..756b7d96 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -45,10 +45,8 @@ jobs: # Run all supported Python versions on linux os: [ubuntu-latest] python-version: ["3.10", "3.11", "3.12"] - # Include one windows and two macOS (intel based and arm based) runs + # Include one windows and one macOS (arm based) run include: - - os: macos-13 - python-version: "3.12" - os: macos-latest python-version: "3.12" - os: windows-latest diff --git a/pyproject.toml b/pyproject.toml index f1300aa0..af57ef29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,12 +27,11 @@ dependencies = [ "fancylog>=0.0.7", "natsort", "numba", - "numpy<2.0.0; sys_platform=='darwin' and platform_machine=='x86_64' or sys_platform=='win32'", + "numpy<2.0.0; sys_platform=='win32'", "numpy", "scikit-image", "scikit-learn", "keras>=3.5.0", - "torch<2.3.0; sys_platform=='darwin' and platform_machine=='x86_64'", "torch>=2.1.0", "tifffile", "tqdm",