Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/netcdf4-python/files/
Date: Wed, 31 Mar 2021 19:51:54
Message-Id: 1617220271.e466d8e9d2f2a09b7d8027fccbf508f5bbd2db9b.conikost@gentoo
1 commit: e466d8e9d2f2a09b7d8027fccbf508f5bbd2db9b
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Mar 29 18:01:18 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 19:51:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e466d8e9
7
8 dev-python/netcdf4-python: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/20183
11 Package-Manager: Portage-3.0.17, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/netcdf4-python-1.5.5-tests.patch | 33 ----------------------
16 1 file changed, 33 deletions(-)
17
18 diff --git a/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch b/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
19 deleted file mode 100644
20 index ff0085c7a1f..00000000000
21 --- a/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
22 +++ /dev/null
23 @@ -1,33 +0,0 @@
24 -# tst_diskless.py fails and tst_dap.py requires network
25 ---- a/test/run_all.py
26 -+++ b/test/run_all.py
27 -@@ -16,9 +16,6 @@ if python3:
28 - else:
29 - test_files.remove('tst_unicode3.py')
30 - sys.stdout.write('not running tst_unicode3.py ...\n')
31 --if __netcdf4libversion__ < '4.2.1' or __has_parallel4_support__ or __has_pnetcdf_support__:
32 -- test_files.remove('tst_diskless.py')
33 -- sys.stdout.write('not running tst_diskless.py ...\n')
34 - if not __has_nc_inq_path__:
35 - test_files.remove('tst_filepath.py')
36 - sys.stdout.write('not running tst_filepath.py ...\n')
37 -@@ -29,14 +26,11 @@ if not __has_cdf5_format__ or struct.calcsize("P") < 8:
38 - test_files.remove('tst_cdf5.py')
39 - sys.stdout.write('not running tst_cdf5.py ...\n')
40 -
41 --# Don't run tests that require network connectivity
42 --if os.getenv('NO_NET'):
43 -- test_files.remove('tst_dap.py');
44 -- sys.stdout.write('not running tst_dap.py ...\n')
45 --else:
46 -- # run opendap test first (issue #856).
47 -- test_files.remove('tst_dap.py')
48 -- test_files.insert(0,'tst_dap.py')
49 -+test_files.remove('tst_diskless.py')
50 -+sys.stdout.write('not running tst_diskless.py ...\n')
51 -+
52 -+test_files.remove('tst_dap.py');
53 -+sys.stdout.write('not running tst_dap.py ...\n')
54 -
55 - # Build the test suite from the tests found in the test files.
56 - testsuite = unittest.TestSuite()