Skip to content

Commit

Permalink
try if removing benchmark tests for win changes something
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Jan 12, 2021
1 parent 59ef101 commit e0471f8
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 4 deletions.
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ source:
- patches/0002-do-not-use-builtins-as-a-dict.patch
- patches/0003-add-skip-for-test_ecos_bb_mi_lp_2.patch # [aarch64]
- patches/0004-reduce-decimal-precision-from-7-default-to-6.patch # [aarch64]
- patches/0005-skip-benchmark-tests-on-windows.patch # [win and py<38]

build:
number: 1
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-remove-pyproject.toml.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4c2ffa56713d610d64c4f3ce653402fa663ea5a7 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sun, 29 Mar 2020 17:50:48 +0200
Subject: [PATCH 1/4] remove pyproject.toml
Subject: [PATCH 1/5] remove pyproject.toml

---
pyproject.toml | 2 --
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0002-do-not-use-builtins-as-a-dict.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c814b080bba947caf1e76ff1ca1669a21da95953 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sun, 10 Jan 2021 23:12:39 +0100
Subject: [PATCH 2/4] do not use builtins as a dict
Subject: [PATCH 2/5] do not use builtins as a dict

---
cvxpy/tests/test_problem.py | 3 ++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e08490761b05841e10d7eb4fd517ecaab5aaa771 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Mon, 11 Jan 2021 23:50:52 +0100
Subject: [PATCH 3/4] add skip for test_ecos_bb_mi_lp_2
Subject: [PATCH 3/5] add skip for test_ecos_bb_mi_lp_2

---
cvxpy/tests/test_conic_solvers.py | 1 +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2647a1bebaf7c799098ced865916457a2103dbe1 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Mon, 11 Jan 2021 23:54:22 +0100
Subject: [PATCH 4/4] reduce decimal precision from 7 (default) to 6
Subject: [PATCH 4/5] reduce decimal precision from 7 (default) to 6

In cvxpy.tests.test_dpp.TestDgp.test_sum_matrix
---
Expand Down
32 changes: 32 additions & 0 deletions recipe/patches/0005-skip-benchmark-tests-on-windows.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 86246e55b2bdc3d51bce28ae84d9c486b9134e38 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Tue, 12 Jan 2021 07:29:26 +0100
Subject: [PATCH 5/5] skip benchmark tests on windows

---
cvxpy/tests/test_benchmarks.py | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cvxpy/tests/test_benchmarks.py b/cvxpy/tests/test_benchmarks.py
index c64be63a..bb96cb55 100644
--- a/cvxpy/tests/test_benchmarks.py
+++ b/cvxpy/tests/test_benchmarks.py
@@ -5,6 +5,7 @@ import numpy as np

import os
import time
+import unittest


def benchmark(func, iters=1, name=None):
@@ -18,6 +19,7 @@ def benchmark(func, iters=1, name=None):
name, np.mean(vals), np.std(vals), iters))


+@unittest.skip('skip benchmarks on windows and py<38')
class TestBenchmarks(BaseTest):
def test_diffcp_sdp_example(self):

--
2.29.2.windows.3

0 comments on commit e0471f8

Please sign in to comment.