Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test and support python 3.10 3.6 for curiosity only #1144

Merged
merged 5 commits into from
Jan 12, 2022
Merged

test and support python 3.10 3.6 for curiosity only #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c86eca
numpy install via
Christian-B Jan 12, 2022
9643e1b
test and support python 3.10 3.6 for curiosity only
Christian-B Jan 12, 2022
afbc82b
test and support python 3.10 3.6 for curiosity only
Christian-B Jan 12, 2022
7a80a52
Merge remote-tracking branch 'origin/3.10' into 3.10
Christian-B Jan 12, 2022
1486992
upated inport to use collections.abc
Christian-B Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python_actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]

steps:
- name: Checkout
Expand Down
3 changes: 0 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ SpiNNaker_PACMAN == 1!6.0.1
SpiNNaker_DataSpecification == 1!6.0.1
spalloc == 1!6.0.1
SpiNNFrontEndCommon == 1!6.0.1
numpy > 1.13, < 1.20; python_version == '3.6'
numpy > 1.13, < 1.21; python_version == '3.7'
numpy; python_version >= '3.8'
lxml
statistics
matplotlib < 3.4; python_version == '3.6'
Expand Down
5 changes: 1 addition & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
'spalloc == 1!6.0.1',
'SpiNNFrontEndCommon == 1!6.0.1',
'pyparsing>=2.2.1,<3.0.0',
"numpy > 1.13, < 1.20; python_version == '3.6'",
"numpy > 1.13, < 1.21; python_version == '3.7'",
"numpy; python_version >= '3.8'",
'lxml',
'quantities >= 0.12.1',
'pynn >= 0.9.1, < 0.10.0 ',
Expand Down Expand Up @@ -107,10 +104,10 @@ def find(main_package):

"Programming Language :: C",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",

"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Neuroscience",
Expand Down
6 changes: 3 additions & 3 deletions spynnaker/pyNN/models/neuron/synapse_dynamics/synapse_dynamics_structural_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

import collections
from collections.abc import Iterable
import numpy
from spinn_utilities.abstract_base import (
AbstractBase, abstractmethod, abstractproperty)
Expand Down Expand Up @@ -240,7 +240,7 @@ def __write_prepopulation_info(
delay_scale = (
MICRO_TO_MILLISECOND_CONVERSION /
machine_time_step())
if isinstance(dynamics.initial_delay, collections.Iterable):
if isinstance(dynamics.initial_delay, Iterable):
spec.write_value(int(dynamics.initial_delay[0] * delay_scale),
data_type=DataType.UINT16)
spec.write_value(int(dynamics.initial_delay[1] * delay_scale),
Expand Down Expand Up @@ -420,7 +420,7 @@ def check_initial_delay(self, max_delay_ms):
:param float max_delay_ms: The maximum delay supported, in milliseconds
:raises Exception: if the delay is out of range
"""
if isinstance(self.initial_delay, collections.Iterable):
if isinstance(self.initial_delay, Iterable):
# pylint: disable=unsubscriptable-object
init_del = self.initial_delay
if init_del[0] > max_delay_ms or init_del[1] > max_delay_ms:
Expand Down