From 0a8d14d97429c426cec7d986b101199eb50a7d38 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Wed, 3 Aug 2022 09:29:33 -0400 Subject: [PATCH 1/3] treewide: Add missing whitespace after keyword (#2460) E275 reported by the new pycodestyle package (v2.9.0) Signed-off-by: Jan Vesely --- psyneulink/core/components/component.py | 2 +- .../functions/stateful/integratorfunctions.py | 4 +- psyneulink/core/components/ports/port.py | 4 +- psyneulink/core/compositions/composition.py | 2 +- psyneulink/core/globals/log.py | 2 +- .../control/agt/lccontrolmechanism.py | 6 +-- .../transfer/recurrenttransfermechanism.py | 2 +- tests/components/test_general.py | 2 +- tests/composition/test_composition.py | 21 ++++------ tests/composition/test_show_graph.py | 4 +- tests/functions/test_user_defined_func.py | 2 +- tests/mechanisms/test_input_state_spec.py | 6 +-- tests/mechanisms/test_kwta.py | 42 +++++++++---------- 13 files changed, 48 insertions(+), 51 deletions(-) diff --git a/psyneulink/core/components/component.py b/psyneulink/core/components/component.py index e62540ece0f..ec84962ef70 100644 --- a/psyneulink/core/components/component.py +++ b/psyneulink/core/components/component.py @@ -2739,7 +2739,7 @@ def _get_param_value_for_modulatory_spec(self, param_name, param_value): raise ComponentError("PROGRAM ERROR: got {} instead of string, Component, or Class".format(param_value)) if param_spec not in MODULATORY_SPEC_KEYWORDS: - return(param_value) + return (param_value) try: param_default_value = getattr(self.defaults, param_name) diff --git a/psyneulink/core/components/functions/stateful/integratorfunctions.py b/psyneulink/core/components/functions/stateful/integratorfunctions.py index afca06fdb6e..7764829ffdb 100644 --- a/psyneulink/core/components/functions/stateful/integratorfunctions.py +++ b/psyneulink/core/components/functions/stateful/integratorfunctions.py @@ -2461,7 +2461,7 @@ def __init__( ) def _validate_noise(self, noise): - if noise is not None and not isinstance(noise, float) and not(isinstance(noise, np.ndarray) and np.issubdtype(noise.dtype, np.floating)): + if noise is not None and not isinstance(noise, float) and not (isinstance(noise, np.ndarray) and np.issubdtype(noise.dtype, np.floating)): raise FunctionError( "Invalid noise parameter for {}: {}. DriftDiffusionIntegrator requires noise parameter to be a float or float array." " Noise parameter is used to construct the standard DDM noise distribution".format(self.name, type(noise))) @@ -2989,7 +2989,7 @@ def _validate_noise(self, noise): noise = np.array(noise) if noise is not None: if (not isinstance(noise, float) - and not(isinstance(noise, np.ndarray) and np.issubdtype(noise.dtype, np.floating))): + and not (isinstance(noise, np.ndarray) and np.issubdtype(noise.dtype, np.floating))): raise FunctionError( f"Invalid noise parameter for {self.name}: {type(noise)}. " f"DriftOnASphereIntegrator requires noise parameter to be a float or float array.") diff --git a/psyneulink/core/components/ports/port.py b/psyneulink/core/components/ports/port.py index bf17f401732..d73ab06be0b 100644 --- a/psyneulink/core/components/ports/port.py +++ b/psyneulink/core/components/ports/port.py @@ -1800,12 +1800,12 @@ def remove_projection(self, projection, context=None): try: if projection in self.mod_afferents or projection in self.path_afferents: self._remove_projection_to_port(projection, context=context) - except(PortError): + except PortError: pass try: if projection in self.efferents: self._remove_projection_from_port(projection, context=context) - except(PortError): + except PortError: pass def _remove_projection_from_port(self, projection, context=None): diff --git a/psyneulink/core/compositions/composition.py b/psyneulink/core/compositions/composition.py index b720ef3921e..df4aba619eb 100644 --- a/psyneulink/core/compositions/composition.py +++ b/psyneulink/core/compositions/composition.py @@ -6354,7 +6354,7 @@ def _get_source(self, projection): # Get info for nested node node, comp = next((item for item in self._get_nested_nodes() if item[0] is port.owner), (None, None)) if node: - return(port, node, comp) + return (port, node, comp) else: raise CompositionError(f"No source found for {projection.name} in {self.name}.") diff --git a/psyneulink/core/globals/log.py b/psyneulink/core/globals/log.py index c6580e6c610..e9fd2005f27 100644 --- a/psyneulink/core/globals/log.py +++ b/psyneulink/core/globals/log.py @@ -1632,7 +1632,7 @@ def csv(self, entries=None, owner_name:bool=False, quotes:tc.optional(tc.any(boo csv += next_eid_entry_data - return(csv) + return (csv) def _validate_entries_arg(self, entries, loggable=True, logged=False): from psyneulink.core.components.component import Component diff --git a/psyneulink/library/components/mechanisms/modulatory/control/agt/lccontrolmechanism.py b/psyneulink/library/components/mechanisms/modulatory/control/agt/lccontrolmechanism.py index ae6b0af7a9d..f715396b12f 100644 --- a/psyneulink/library/components/mechanisms/modulatory/control/agt/lccontrolmechanism.py +++ b/psyneulink/library/components/mechanisms/modulatory/control/agt/lccontrolmechanism.py @@ -930,15 +930,15 @@ def remove_modulated_mechanisms(self, mechanisms:list): # Delete ControlProjection ControlSignal's list of efferents index = self.control_signals[0].efferents[control_projection] - del(self.control_signals[0].efferents[index]) + del self.control_signals[0].efferents[index] # Delete ControlProjection from recipient ParameterPort index = parameter_port.mod_afferents[control_projection] - del(parameter_port.mod_afferents[index]) + del parameter_port.mod_afferents[index] # Delete Mechanism from self.modulated_mechanisms index = self.modulated_mechanisms.index(mech) - del(self.modulated_mechanisms[index]) + del self.modulated_mechanisms[index] def show(self): """Display the `OutputPorts ` monitored by the LCControlMechanism's `objective_mechanism` diff --git a/psyneulink/library/components/mechanisms/processing/transfer/recurrenttransfermechanism.py b/psyneulink/library/components/mechanisms/processing/transfer/recurrenttransfermechanism.py index 3724b53f732..85bc986c38f 100644 --- a/psyneulink/library/components/mechanisms/processing/transfer/recurrenttransfermechanism.py +++ b/psyneulink/library/components/mechanisms/processing/transfer/recurrenttransfermechanism.py @@ -1085,7 +1085,7 @@ def _instantiate_recurrent_projection(self, new_input_port = InputPort(owner=self, name=RECURRENT, variable=self.defaults.variable[0], internal_only=True) assert (len(new_input_port.all_afferents) == 0) # just a sanity check - assert(self.input_port.name != "Recurrent Input Port") + assert self.input_port.name != "Recurrent Input Port" # Rename existing InputPort as EXTERNAL remove_instance_from_registry(registry=self._portRegistry, category=INPUT_PORT, diff --git a/tests/components/test_general.py b/tests/components/test_general.py index dd4c8f23de7..83aa0168f9f 100644 --- a/tests/components/test_general.py +++ b/tests/components/test_general.py @@ -126,7 +126,7 @@ def test_all_dependent_parameters( params_inner_comp_keys = set(params_inner_comp.keys()) assert params_inner_comp_keys.issubset(params_comp_keys) - assert( + assert ( len(params_comp_keys) == 0 or not params_comp_keys.issubset(params_inner_comp_keys) ) diff --git a/tests/composition/test_composition.py b/tests/composition/test_composition.py index 230af9f4c34..01dd5053c73 100644 --- a/tests/composition/test_composition.py +++ b/tests/composition/test_composition.py @@ -7629,14 +7629,12 @@ def test_rebuild_scheduler_after_add_node(self): comp.run(inputs={A: [0], B: [0]}) assert type(comp.scheduler.conditions[A]) is pnl.Always - assert( - type(comp.scheduler.conditions[B]) is pnl.EveryNCalls - and comp.scheduler.conditions[B].args == (A, 2) - ) - assert( - type(comp.scheduler.conditions[C]) is pnl.EveryNCalls - and comp.scheduler.conditions[C].args == (A, 2) - ) + assert type(comp.scheduler.conditions[B]) is pnl.EveryNCalls + assert comp.scheduler.conditions[B].args == (A, 2) + + assert type(comp.scheduler.conditions[C]) is pnl.EveryNCalls + assert comp.scheduler.conditions[C].args == (A, 2) + assert comp.scheduler.execution_list[comp.default_execution_id] == [{A}, {A, B}, {C}] assert set(comp.scheduler._user_specified_conds.keys()) == {B, C} @@ -7654,10 +7652,9 @@ def test_rebuild_scheduler_after_remove_node(self): assert type(comp.scheduler.conditions[A]) is pnl.Always assert B not in comp.scheduler.conditions - assert( - type(comp.scheduler.conditions[C]) is pnl.EveryNCalls - and comp.scheduler.conditions[C].args == (A, 2) - ) + assert type(comp.scheduler.conditions[C]) is pnl.EveryNCalls + assert comp.scheduler.conditions[C].args == (A, 2) + assert comp.scheduler.execution_list[comp.default_execution_id] == [{A}, {A}, {C}] assert set(comp.scheduler._user_specified_conds.keys()) == {C} diff --git a/tests/composition/test_show_graph.py b/tests/composition/test_show_graph.py index 65836803fcb..9d81254486b 100644 --- a/tests/composition/test_show_graph.py +++ b/tests/composition/test_show_graph.py @@ -766,7 +766,7 @@ def test_projections_from_nested_comp_to_ocm_or_obj_mech(self, show_graph_kwargs # OCM's outcome_input_port. # If the test fails in this condition, it could mean that the bug has been corrected. # The bug may be the same one as in eb61303808ad2a5ba46fdd18d0e583283397915c - raise(AssertionError,"FAILURE TO REPLICATE BUGGY SHOW_GRAPH OUTPUT -- SEE COMMENT IN TEST") + raise (AssertionError,"FAILURE TO REPLICATE BUGGY SHOW_GRAPH OUTPUT -- SEE COMMENT IN TEST") # elif ('show_node_structure' in show_graph_kwargs # and ('show_cim' in show_graph_kwargs # and show_graph_kwargs['show_cim'] is True) @@ -775,7 +775,7 @@ def test_projections_from_nested_comp_to_ocm_or_obj_mech(self, show_graph_kwargs # ): # pass else: - raise(AssertionError) + raise (AssertionError) # def test_show_graph_for_nested_composition_as_agent_rep(self): # """Note: this is the same as test_control/test_nested_composition_as_agent_rep but with show_graph()""" diff --git a/tests/functions/test_user_defined_func.py b/tests/functions/test_user_defined_func.py index d6786284fde..77d12fca243 100644 --- a/tests/functions/test_user_defined_func.py +++ b/tests/functions/test_user_defined_func.py @@ -625,7 +625,7 @@ def myFunction(variable, context): T2 = TransferMechanism(size=3, function=Linear) c2 = Composition(pathways=[[T2, myMech]]) benchmark(c2.run, inputs={T2: [[1, 2, 3]]}, execution_mode=comp_mode) - assert(np.allclose(c2.results[0][0], [3, 1])) + assert np.allclose(c2.results[0][0], [3, 1]) def test_udf_with_pnl_func(): diff --git a/tests/mechanisms/test_input_state_spec.py b/tests/mechanisms/test_input_state_spec.py index 241ded93279..bb86f0db226 100644 --- a/tests/mechanisms/test_input_state_spec.py +++ b/tests/mechanisms/test_input_state_spec.py @@ -698,9 +698,9 @@ def test_multiple_states_specified_using_port_Name_format_error(self): # Don't bother to specify anything as the value for each entry in the dict, since doesn't get there TransferMechanism(input_ports=[{'MY PORT A':{}, 'MY PORT B':{}}]) - assert ('There is more than one entry of the InputPort specification dictionary' in str(error_text.value) - and'that is not a keyword; there should be only one (used to name the Port, with a list of ' - 'Projection specifications' in str(error_text.value)) + assert 'There is more than one entry of the InputPort specification dictionary' in str(error_text.value) + assert ('that is not a keyword; there should be only one (used to name the Port, with a list of ' + 'Projection specifications' in str(error_text.value)) # ------------------------------------------------------------------------------------------------ # TEST 32 diff --git a/tests/mechanisms/test_kwta.py b/tests/mechanisms/test_kwta.py index 905e5d33df5..8154995671b 100644 --- a/tests/mechanisms/test_kwta.py +++ b/tests/mechanisms/test_kwta.py @@ -16,9 +16,9 @@ class TestKWTAInputs: def test_kwta_empty_spec(self): K = KWTAMechanism() np.testing.assert_allclose(K.value, K.defaults.value) - assert(K.defaults.variable == [[0]]) - assert(K.size == [1]) - assert(K.matrix.base == [[5]]) + assert K.defaults.variable == [[0]] + assert K.size == [1] + assert K.matrix.base == [[5]] def test_kwta_check_attrs(self): K = KWTAMechanism( @@ -26,11 +26,11 @@ def test_kwta_check_attrs(self): size=3 ) np.testing.assert_allclose(K.value, K.defaults.value) - assert(np.allclose(K.defaults.variable, [[0., 0., 0.]])) - assert(K.size == [3]) - assert(np.allclose(K.matrix.base, [[5, 0, 0], [0, 5, 0], [0, 0, 5]])) - assert(K.recurrent_projection.sender is K.output_port) - assert(K.recurrent_projection.receiver is K.input_port) + assert np.allclose(K.defaults.variable, [[0., 0., 0.]]) + assert K.size == [3] + assert np.allclose(K.matrix.base, [[5, 0, 0], [0, 5, 0], [0, 0, 5]]) + assert K.recurrent_projection.sender is K.output_port + assert K.recurrent_projection.receiver is K.input_port def test_kwta_inputs_list_of_ints(self): K = KWTAMechanism( @@ -38,17 +38,17 @@ def test_kwta_inputs_list_of_ints(self): default_variable=[0, 0, 0, 0] ) val = K.execute([10, 12, 0, -1]) - assert(np.allclose(val, [[0.9933071490757153, 0.9990889488055994, 0.0066928509242848554, 0.0024726231566347743]])) + assert np.allclose(val, [[0.9933071490757153, 0.9990889488055994, 0.0066928509242848554, 0.0024726231566347743]]) val = K.execute([1, 2, 3, 0]) - assert(np.allclose(val, [[0.3775406687981454, 0.6224593312018546, 0.8175744761936437, 0.18242552380635635]])) + assert np.allclose(val, [[0.3775406687981454, 0.6224593312018546, 0.8175744761936437, 0.18242552380635635]]) def test_kwta_no_inputs(self): K = KWTAMechanism( name='K' ) - assert(K.defaults.variable == [[0]]) + assert K.defaults.variable == [[0]] val = K.execute([10]) - assert(np.allclose(val, [[0.5]])) + assert np.allclose(val, [[0.5]]) def test_kwta_inputs_list_of_strings(self): with pytest.raises(MechanismError) as error_text: @@ -57,8 +57,8 @@ def test_kwta_inputs_list_of_strings(self): size = 4, ) K.execute(["one", "two", "three", "four"]) - assert('"Input to \'K\' ([\'one\' \'two\' \'three\' \'four\']) is incompatible with its corresponding ' - 'InputPort (K[InputPort-0]): \'cannot perform reduce with flexible type.\'"' in str(error_text.value)) + assert ('"Input to \'K\' ([\'one\' \'two\' \'three\' \'four\']) is incompatible with its corresponding ' + 'InputPort (K[InputPort-0]): \'cannot perform reduce with flexible type.\'"' in str(error_text.value)) def test_kwta_var_list_of_strings(self): with pytest.raises(ParameterError) as error_text: @@ -67,7 +67,7 @@ def test_kwta_var_list_of_strings(self): default_variable=['a', 'b', 'c', 'd'], integrator_mode=True ) - assert("non-numeric entries" in str(error_text.value)) + assert ("non-numeric entries" in str(error_text.value)) def test_recurrent_mech_inputs_mismatched_with_default_longer(self): with pytest.raises(MechanismError) as error_text: @@ -76,7 +76,7 @@ def test_recurrent_mech_inputs_mismatched_with_default_longer(self): size=4 ) K.execute([1, 2, 3, 4, 5]) - assert("does not match required length" in str(error_text.value)) + assert ("does not match required length" in str(error_text.value)) def test_recurrent_mech_inputs_mismatched_with_default_shorter(self): with pytest.raises(MechanismError) as error_text: @@ -85,7 +85,7 @@ def test_recurrent_mech_inputs_mismatched_with_default_shorter(self): size=6 ) K.execute([1, 2, 3, 4, 5]) - assert("does not match required length" in str(error_text.value)) + assert ("does not match required length" in str(error_text.value)) class TestKWTAFunction: @@ -174,7 +174,7 @@ def test_kwta_matrix_keyword_spec(self): matrix=m ) val = K.execute([10, 10, 10, 10]) - assert(np.allclose(val, [[.5, .5, .5, .5]])) + assert np.allclose(val, [[.5, .5, .5, .5]]) def test_kwta_matrix_auto_hetero_spec(self): K = KWTAMechanism( @@ -183,7 +183,7 @@ def test_kwta_matrix_auto_hetero_spec(self): auto=3, hetero=2 ) - assert(np.allclose(K.recurrent_projection.matrix.base, [[3, 2, 2, 2], [2, 3, 2, 2], [2, 2, 3, 2], [2, 2, 2, 3]])) + assert np.allclose(K.recurrent_projection.matrix.base, [[3, 2, 2, 2], [2, 3, 2, 2], [2, 2, 3, 2], [2, 2, 2, 3]]) def test_kwta_matrix_hetero_spec(self): K = KWTAMechanism( @@ -191,7 +191,7 @@ def test_kwta_matrix_hetero_spec(self): size=3, hetero=-.5, ) - assert(np.allclose(K.recurrent_projection.matrix.base, [[5, -.5, -.5], [-.5, 5, -.5], [-.5, -.5, 5]])) + assert np.allclose(K.recurrent_projection.matrix.base, [[5, -.5, -.5], [-.5, 5, -.5], [-.5, -.5, 5]]) def test_kwta_matrix_auto_spec(self): K = KWTAMechanism( @@ -199,7 +199,7 @@ def test_kwta_matrix_auto_spec(self): size=3, auto=-.5, ) - assert(np.allclose(K.recurrent_projection.matrix.base, [[-.5, 0, 0], [0, -.5, 0], [0, 0, -.5]])) + assert np.allclose(K.recurrent_projection.matrix.base, [[-.5, 0, 0], [0, -.5, 0], [0, 0, -.5]]) class TestKWTARatio: From 6c091bdadfc119c6b791bb48efad1905f5a373a3 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Wed, 3 Aug 2022 20:24:59 -0400 Subject: [PATCH 2/3] github-actions/install-pnl: Move upgrade of pip+wheel to its own step (#2461) Signed-off-by: Jan Vesely --- .github/actions/install-pnl/action.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-pnl/action.yml b/.github/actions/install-pnl/action.yml index cd4dca7dbe9..dedae754886 100644 --- a/.github/actions/install-pnl/action.yml +++ b/.github/actions/install-pnl/action.yml @@ -37,6 +37,10 @@ runs: echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV echo "$PYTHON_LOC" >> $GITHUB_PATH + - name: Update pip and wheel + shell: bash + run: python -m pip install --upgrade pip wheel + - name: Drop pytorch on x86 shell: bash run: | @@ -53,7 +57,6 @@ runs: shell: bash id: new_package run: | - python -m pip install --upgrade pip wheel export NEW_PACKAGE=`echo '${{ github.head_ref }}' | cut -f 4 -d/ | sed 's/-gt.*//' | sed 's/-lt.*//'` echo "::set-output name=new_package::$NEW_PACKAGE" pip install "`echo $NEW_PACKAGE | sed 's/[-_]/./g' | xargs grep *requirements.txt -h -e | head -n1`" @@ -62,7 +65,6 @@ runs: - name: Python dependencies shell: bash run: | - python -m pip install --upgrade pip wheel pip install -e .[${{ inputs.features }}] - name: "Cleanup old wheels" From 68900a3ba0a5f31555851688c5d9b2f41534a3b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 21:05:29 +0000 Subject: [PATCH 3/3] requirements: update modelspec requirement from <0.2.6 to <0.2.7 (#2458) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 302ecce50e9..1b67c662835 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ grpcio-tools<1.43.0 llvmlite<0.40 matplotlib<3.5.3 modeci_mdf>=0.3.4, <0.4.2 -modelspec<0.2.6 +modelspec<0.2.7 networkx<2.9 numpy<1.21.7, >=1.17.0 pillow<9.3.0