Skip to content

Commit 09ecccd

Browse files
samuelgarciasamuelgarcia
authored
Merge pull request #1209 from apdavison/nep-plus-one
update test matrix following NEP29 + 1 year
2 parents c3b8d10 + 3617377 commit 09ecccd

File tree

6 files changed

+32
-34
lines changed

6 files changed

+32
-34
lines changed

‎.github/workflows/core-test.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
push:
1010
branches: [master]
1111

12-
13-
1412
jobs:
1513
multi-os-python-numpy:
1614
runs-on: ${{ matrix.os }}
@@ -20,19 +18,19 @@ jobs:
2018
matrix:
2119
os: ["ubuntu-latest", "windows-latest"]
2220
# "macos-latest",
23-
python-version: ['3.7', '3.8', '3.9', '3.10']
24-
numpy-version: ['1.18.5', '1.19.5', '1.20.3', '1.21.6', '1.22.4', '1.23.0']
21+
python-version: ['3.8', '3.9', '3.10', '3.11']
22+
numpy-version: ['1.19.5', '1.20.3', '1.21.6', '1.22.4', '1.23.5', '1.24.1']
2523
exclude:
26-
- python-version: '3.7'
27-
numpy-version: '1.22.4'
28-
- python-version: '3.7'
29-
numpy-version: '1.23.0'
30-
- python-version: '3.10'
31-
numpy-version: '1.18.5'
3224
- python-version: '3.10'
3325
numpy-version: '1.19.5'
3426
- python-version: '3.10'
3527
numpy-version: '1.20.3'
28+
- python-version: '3.11'
29+
numpy-version: '1.19.5'
30+
- python-version: '3.11'
31+
numpy-version: '1.20.3'
32+
- python-version: '3.11'
33+
numpy-version: '1.21.6'
3634
steps:
3735
- name: Set up Python ${{ matrix.python-version }}
3836
uses: actions/setup-python@v4

‎doc/source/developers_guide.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ a GitHub account and then set to watch the repository at `GitHub Repository`_
3838
Requirements
3939
------------
4040

41-
* Python_ 3.7 or later
42-
* numpy_ >= 1.11.0
41+
* Python_ 3.8 or later
42+
* numpy_ >= 1.19.5
4343
* quantities_ >= 0.12.1
4444
* nose_ >= 1.1.2 (for running tests)
4545
* Sphinx_ (for building documentation)
@@ -193,15 +193,15 @@ open a pull request on GitHub
193193
Python version
194194
--------------
195195

196-
Neo should work with Python 3.7 or newer. If you need support for Python 2.7,
196+
Neo should work with Python 3.8 or newer. If you need support for Python 2.7,
197197
use Neo v0.8.0 or earlier.
198198

199199

200200
Coding standards and style
201201
--------------------------
202202

203203
All code should conform as much as possible to `PEP 8`_, and should run with
204-
Python 3.7 or newer.
204+
Python 3.8 or newer.
205205

206206
You can use the `pep8`_ program to check the code for PEP 8 conformity.
207207
You can also use `flake8`_, which combines pep8 and pyflakes.

‎doc/source/install.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Installing from the Python Package Index
1111
Dependencies
1212
------------
1313

14-
* Python_ >= 3.7
15-
* numpy_ >= 1.18.5
14+
* Python_ >= 3.8
15+
* numpy_ >= 1.19.5
1616
* quantities_ >= 0.12.1
1717

1818
You can install the latest published version of Neo and its dependencies using::

‎neo/test/coretest/test_base.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -781,16 +781,16 @@ def test_numpy_array_uint(self):
781781
result = {'data': value}
782782
self.assertDictEqual(result, self.base.annotations)
783783

784-
def test_numpy_array_int0(self):
785-
'''test to make sure int0 type numpy arrays are accepted'''
786-
value = np.array([1, 2, 3, 4, 5], dtype=np.int0)
784+
def test_numpy_array_intp(self):
785+
'''test to make sure intp type numpy arrays are accepted'''
786+
value = np.array([1, 2, 3, 4, 5], dtype=np.intp)
787787
self.base.annotate(data=value)
788788
result = {'data': value}
789789
self.assertDictEqual(result, self.base.annotations)
790790

791-
def test_numpy_array_uint0(self):
792-
'''test to make sure uint0 type numpy arrays are accepted'''
793-
value = np.array([1, 2, 3, 4, 5], dtype=np.uint0)
791+
def test_numpy_array_uintp(self):
792+
'''test to make sure uintp type numpy arrays are accepted'''
793+
value = np.array([1, 2, 3, 4, 5], dtype=np.uintp)
794794
self.base.annotate(data=value)
795795
result = {'data': value}
796796
self.assertDictEqual(result, self.base.annotations)
@@ -940,7 +940,7 @@ def test_numpy_array_str(self):
940940

941941
def test_numpy_array_string0(self):
942942
'''test to make sure string0 type numpy arrays are accepted'''
943-
value = np.array([1, 2, 3, 4, 5], dtype=np.str0)
943+
value = np.array([1, 2, 3, 4, 5], dtype=np.str_)
944944
self.base.annotate(data=value)
945945
result = {'data': value}
946946
self.assertDictEqual(result, self.base.annotations)
@@ -969,16 +969,16 @@ def test_numpy_scalar_uint(self):
969969
result = {'data': value}
970970
self.assertDictEqual(result, self.base.annotations)
971971

972-
def test_numpy_scalar_int0(self):
973-
'''test to make sure int0 type numpy scalars are accepted'''
974-
value = np.array(99, dtype=np.int0)
972+
def test_numpy_scalar_intp(self):
973+
'''test to make sure intp type numpy scalars are accepted'''
974+
value = np.array(99, dtype=np.intp)
975975
self.base.annotate(data=value)
976976
result = {'data': value}
977977
self.assertDictEqual(result, self.base.annotations)
978978

979-
def test_numpy_scalar_uint0(self):
980-
'''test to make sure uint0 type numpy scalars are accepted'''
981-
value = np.array(99, dtype=np.uint0)
979+
def test_numpy_scalar_uintp(self):
980+
'''test to make sure uintp type numpy scalars are accepted'''
981+
value = np.array(99, dtype=np.uintp)
982982
self.base.annotate(data=value)
983983
result = {'data': value}
984984
self.assertDictEqual(result, self.base.annotations)
@@ -1127,7 +1127,7 @@ def test_numpy_array_str(self):
11271127

11281128
def test_numpy_scalar_string0(self):
11291129
'''test to make sure string0 type numpy scalars are rejected'''
1130-
value = np.array(99, dtype=np.str0)
1130+
value = np.array(99, dtype=np.str_)
11311131
self.base.annotate(data=value)
11321132
result = {'data': value}
11331133
self.assertDictEqual(result, self.base.annotations)

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packaging
2-
numpy>=1.18.5
2+
numpy>=1.19.5
33
quantities>=0.12.1

‎setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
long_description = open("README.rst").read()
77
install_requires = ['packaging',
8-
'numpy>=1.18.5',
8+
'numpy>=1.19.5',
99
'quantities>=0.12.1']
1010
extras_require = {
1111
'igorproio': ['igor'],
@@ -44,18 +44,18 @@
4444
long_description=long_description,
4545
license="BSD-3-Clause",
4646
url='https://neuralensemble.org/neo',
47-
python_requires=">=3.7",
47+
python_requires=">=3.8",
4848
classifiers=[
4949
'Development Status :: 4 - Beta',
5050
'Intended Audience :: Science/Research',
5151
'License :: OSI Approved :: BSD License',
5252
'Natural Language :: English',
5353
'Operating System :: OS Independent',
5454
'Programming Language :: Python :: 3',
55-
'Programming Language :: Python :: 3.7',
5655
'Programming Language :: Python :: 3.8',
5756
'Programming Language :: Python :: 3.9',
5857
'Programming Language :: Python :: 3.10',
58+
'Programming Language :: Python :: 3.11',
5959
'Programming Language :: Python :: 3 :: Only',
6060
'Topic :: Scientific/Engineering']
6161
)

0 commit comments

Comments
 (0)