From 0e4a82cce38782de4d1215bd8ab06f71c9c91175 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Tue, 19 Nov 2019 15:25:22 +0100 Subject: [PATCH 1/6] Conditional query to add new argument for module() in py3.8 --- pynest/nest/import_libs.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pynest/nest/import_libs.py b/pynest/nest/import_libs.py index 727a64c4fb..4a592f0db2 100644 --- a/pynest/nest/import_libs.py +++ b/pynest/nest/import_libs.py @@ -21,6 +21,7 @@ import ast import os +import sys # We search through the subdirectory "lib" of the "nest" module @@ -68,7 +69,13 @@ def import_libs(mod_file, mod_dict, path, # construct from .pkg_name import * names = [ast.alias(name='*', asname=None)] body = [ast.ImportFrom(module=pkg_name, names=names, level=level)] - module = ast.fix_missing_locations(ast.Module(body=body)) + + # changes in python 3.8 + # see https://bugs.python.org/issue35894 + if sys.version_info >= (3, 8): + module = ast.fix_missing_locations(ast.Module(body=body, type_ignores=[])) + else: + module = ast.fix_missing_locations(ast.Module(body=body)) code = compile(module, mod_file, 'exec') exec(code, mod_dict, mod_dict) From 89ee1d786211c8709b17309dc24f2852064cad43 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Wed, 20 Nov 2019 08:37:44 +0100 Subject: [PATCH 2/6] Fix some errors with make installcheck. time.clock() has been removed in py38 --- pynest/nest/tests/test_sp/test_growth_curves.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pynest/nest/tests/test_sp/test_growth_curves.py b/pynest/nest/tests/test_sp/test_growth_curves.py index 72a23d0cf1..988305f120 100644 --- a/pynest/nest/tests/test_sp/test_growth_curves.py +++ b/pynest/nest/tests/test_sp/test_growth_curves.py @@ -306,7 +306,7 @@ def simulate(self): self.se_python = numpy.zeros( (len(self.se_integrator), len(self.sim_steps))) - start = time.clock() + start = time.process_time() for t_i, t in enumerate(self.sim_steps): for n_i, n in enumerate(self.local_nodes): self.ca_nest[n_i][t_i], synaptic_elements = nest.GetStatus( @@ -314,7 +314,7 @@ def simulate(self): self.se_nest[n_i][t_i] = synaptic_elements['se']['z'] nest.Simulate(self.sim_step) - start = time.clock() + start = time.process_time() tmp = nest.GetStatus(self.spike_detector, 'events')[0] spikes_all = tmp['times'] senders_all = tmp['senders'] From 00dd6285460c66269a3d30508944004151cc6bdf Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Wed, 20 Nov 2019 09:49:54 +0100 Subject: [PATCH 3/6] check for >=py38 --- pynest/nest/tests/test_sp/test_growth_curves.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pynest/nest/tests/test_sp/test_growth_curves.py b/pynest/nest/tests/test_sp/test_growth_curves.py index 988305f120..763c81f95d 100644 --- a/pynest/nest/tests/test_sp/test_growth_curves.py +++ b/pynest/nest/tests/test_sp/test_growth_curves.py @@ -26,6 +26,7 @@ import unittest import nest import time +import sys HAVE_OPENMP = nest.ll_api.sli_func("is_threaded") @@ -306,7 +307,10 @@ def simulate(self): self.se_python = numpy.zeros( (len(self.se_integrator), len(self.sim_steps))) - start = time.process_time() + if sys.version_info >= (3, 8): + start = time.process_time() + else: + start = time.clock() for t_i, t in enumerate(self.sim_steps): for n_i, n in enumerate(self.local_nodes): self.ca_nest[n_i][t_i], synaptic_elements = nest.GetStatus( @@ -314,7 +318,10 @@ def simulate(self): self.se_nest[n_i][t_i] = synaptic_elements['se']['z'] nest.Simulate(self.sim_step) - start = time.process_time() + if sys.version_info >= (3, 8): + start = time.process_time() + else: + start = time.clock() tmp = nest.GetStatus(self.spike_detector, 'events')[0] spikes_all = tmp['times'] senders_all = tmp['senders'] From cec85bc88c2e2b3dfd0906a537d47318f5fcaace Mon Sep 17 00:00:00 2001 From: graber Date: Sat, 23 Nov 2019 12:18:31 +0100 Subject: [PATCH 4/6] Added new line after import --- pynest/nest/tests/test_sp/test_growth_curves.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pynest/nest/tests/test_sp/test_growth_curves.py b/pynest/nest/tests/test_sp/test_growth_curves.py index 763c81f95d..11ff551e61 100644 --- a/pynest/nest/tests/test_sp/test_growth_curves.py +++ b/pynest/nest/tests/test_sp/test_growth_curves.py @@ -27,6 +27,7 @@ import nest import time import sys + HAVE_OPENMP = nest.ll_api.sli_func("is_threaded") From 49099fb622c5658c72e3cc837e95004d642223bf Mon Sep 17 00:00:00 2001 From: graber Date: Sat, 23 Nov 2019 18:11:40 +0100 Subject: [PATCH 5/6] Check for python 3.3 --- pynest/nest/tests/test_sp/test_growth_curves.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pynest/nest/tests/test_sp/test_growth_curves.py b/pynest/nest/tests/test_sp/test_growth_curves.py index 11ff551e61..b38f496b1b 100644 --- a/pynest/nest/tests/test_sp/test_growth_curves.py +++ b/pynest/nest/tests/test_sp/test_growth_curves.py @@ -308,7 +308,7 @@ def simulate(self): self.se_python = numpy.zeros( (len(self.se_integrator), len(self.sim_steps))) - if sys.version_info >= (3, 8): + if sys.version_info >= (3, 3): start = time.process_time() else: start = time.clock() @@ -319,7 +319,7 @@ def simulate(self): self.se_nest[n_i][t_i] = synaptic_elements['se']['z'] nest.Simulate(self.sim_step) - if sys.version_info >= (3, 8): + if sys.version_info >= (3, 3): start = time.process_time() else: start = time.clock() From e6469ae22ea5edd91a7340ff87c681b1fa265a11 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Sun, 24 Nov 2019 13:05:34 +0100 Subject: [PATCH 6/6] Delted 'start' variable --- pynest/nest/tests/test_sp/test_growth_curves.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pynest/nest/tests/test_sp/test_growth_curves.py b/pynest/nest/tests/test_sp/test_growth_curves.py index b38f496b1b..c7d9f0a892 100644 --- a/pynest/nest/tests/test_sp/test_growth_curves.py +++ b/pynest/nest/tests/test_sp/test_growth_curves.py @@ -308,10 +308,6 @@ def simulate(self): self.se_python = numpy.zeros( (len(self.se_integrator), len(self.sim_steps))) - if sys.version_info >= (3, 3): - start = time.process_time() - else: - start = time.clock() for t_i, t in enumerate(self.sim_steps): for n_i, n in enumerate(self.local_nodes): self.ca_nest[n_i][t_i], synaptic_elements = nest.GetStatus( @@ -319,10 +315,6 @@ def simulate(self): self.se_nest[n_i][t_i] = synaptic_elements['se']['z'] nest.Simulate(self.sim_step) - if sys.version_info >= (3, 3): - start = time.process_time() - else: - start = time.clock() tmp = nest.GetStatus(self.spike_detector, 'events')[0] spikes_all = tmp['times'] senders_all = tmp['senders']