Merge branch 'master' into pynn_report

Author: rowleya

spynnaker/pyNN/__init__.py

@@ -72,7 +72,6 @@
     PoolDenseConnector)
 # synapse structures
 from spynnaker.pyNN.models.neuron.synapse_dynamics import (
-    AbstractStaticSynapseDynamics,
     SynapseDynamicsStatic as StaticSynapse)
 
 # plastic stuff
@@ -147,6 +146,8 @@
 
 # big stuff
 from spynnaker.pyNN.spinnaker import SpiNNaker
+from spynnaker.pyNN.models.neuron.synapse_dynamics import (
+    AbstractSynapseDynamics)
 
 from spynnaker._version import __version__  # NOQA
 from spynnaker._version import __version_name__  # NOQA
@@ -325,7 +326,7 @@ def Projection(
         presynaptic_population: Population,
         postsynaptic_population: Population,
         connector: AbstractConnector,
-        synapse_type: Optional[AbstractStaticSynapseDynamics] = None,
+        synapse_type: Optional[AbstractSynapseDynamics] = None,
         source: None = None, receptor_type: str = "excitatory",
         space: Optional[Space] = None, label: Optional[str] = None,
         download_synapses: bool = False,