Merge branch 'devel' into feat/convnet

PrincetonUniversity · Jan 20, 2021 · 24f6c2b · 24f6c2b
2 parents 1f80b25 + 76b754f
commit 24f6c2b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/cleanup-pip-cache/action.yml b/.github/actions/cleanup-pip-cache/action.yml
@@ -13,6 +13,6 @@ runs:
         for P in $CACHED; do
           # Remove cached and not installed
           if [ `echo $INSTALLED | grep -o $P | wc -l` == "0" ] ; then
-            pip cache remove -v $P
+            pip cache remove -v $P || true
           fi
         done
diff --git a/.github/workflows/pnl-ci-docs.yml b/.github/workflows/pnl-ci-docs.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7] # Doesn't work in 3.8 or 3.9
+        python-version: [3.6, 3.7, 3.8]
         python-architecture: ['x64']
         os: [ubuntu-latest, macos-latest, windows-latest]
 

diff --git a/.github/workflows/pnl-ci.yml b/.github/workflows/pnl-ci.yml
@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         include:
           # add 32-bit build on windows
-          - python-version: 3.6
+          - python-version: 3.8
             python-architecture: 'x86'
             os: windows-latest
 

diff --git a/psyneulink/core/components/ports/inputport.py b/psyneulink/core/components/ports/inputport.py
@@ -992,7 +992,7 @@ def _parse_port_specific_specs(self, owner, port_dict, port_specific_spec):
             (port_spec, weights, exponents, connections)
 
         See Port._parse_port_specific_spec for additional info.
-.
+
         Returns:
              - port_spec:  1st item of tuple if it is a numeric value;  otherwise None
              - params dict with WEIGHT, EXPONENT and/or PROJECTIONS entries if any of these was specified.