Merge branch 'master' of https://github.com/psychopy/psychopy

psychopy · Jul 11, 2019 · f1a914a · f1a914a
2 parents 0bf7c9e + 846f2c3
commit f1a914a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 76 deletions.
diff --git a/conda/environment-2.7.yml b/conda/environment-2.7.yml
@@ -6,8 +6,6 @@ dependencies:
 - arabic_reshaper
 - astunparse
 - backports
-- bzip2
-- cffi
 - codecov
 - coveralls
 - esprima-python
@@ -19,54 +17,37 @@ dependencies:
 - greenlet
 - imageio<2.5
 - json_tricks
-- libffi
-- libflac
 - lxml
 - matplotlib
 - moviepy
 - msgpack-numpy
 - msgpack-python
-- numexpr
 - numpy
 - opencv
 - openpyxl
 - pandas
 - pillow
-- pip<19.0
-- pixman
-- prompt_toolkit
+- pip!=19.0,!=19.0.1,!=19.0.2
 - psutil
-- pycparser
-- pygments
+- pyglet>=1.3,<1.4
 - pyopengl
-- pyopenssl
 - pyosf
 - pyqt
 - pyserial
 - pysoundfile
+- pytables
+- pytest<4.1
 - python-bidi
+- pytest-cov
+- python-gitlab
+- python-sounddevice
 - pyyaml
 - pyzmq
 - requests
 - scipy
-- setuptools
-- sip
-- six
-- pyglet>=1.3
-- pytables
-- python-gitlab
-- urllib3
 - wheel
-- xlrd
-- xz
-- yaml
-- lzo
-- pytables
-- pytest<4.1
-- pytest-cov
-- python-sounddevice
 - wxpython!=4.0.2,!=4.0.3
-- zlib
+- xlrd
 - pip:
   - pygame
   - pyparallel
diff --git a/conda/environment-3.6.yml b/conda/environment-3.6.yml
@@ -6,8 +6,6 @@ dependencies:
 - arabic_reshaper
 - astunparse
 - backports
-- bzip2
-- cffi
 - codecov
 - coveralls
 - esprima-python
@@ -17,53 +15,40 @@ dependencies:
 - future
 - gevent
 - greenlet
-- hdf5
 - imageio
 - imageio-ffmpeg
 - json_tricks
-- libflac
 - lxml
 - matplotlib
 - moviepy
 - msgpack-numpy
 - msgpack-python
-- numexpr
 - numpy
 - opencv
 - openpyxl
 - pandas
 - pillow
-- pip<19.0
+- pip!=19.0,!=19.0.1,!=19.0.2
 - psutil
+- pyglet>=1.3,<1.4
 - pyopengl
 - pyosf
 - pyqt
 - pyserial
 - pysoundfile
+- pytables
 - pytest<4.1
 - pytest-cov
 - python-bidi
+- python-gitlab
 - python-sounddevice
 - pyyaml
 - pyzmq
 - requests
 - scipy
-- setuptools
-- sip
-- six
-- pyglet>=1.3
-- pytables
-- python-gitlab
-- urllib3
 - wheel
-- x264
-- xlrd
-- xz
-- yaml
-- lzo
-- pytables
 - wxpython!=4.0.2,!=4.0.3
-- zlib
+- xlrd
 - pip:
   - pygame
   - pyparallel
diff --git a/conda/environment-3.7.yml b/conda/environment-3.7.yml
@@ -6,8 +6,6 @@ dependencies:
 - arabic_reshaper
 - astunparse
 - backports
-- bzip2
-- cffi
 - codecov
 - coveralls
 - esprima-python
@@ -17,52 +15,40 @@ dependencies:
 - future
 - gevent
 - greenlet
-- hdf5
 - imageio
 - imageio-ffmpeg
 - json_tricks
-- libflac
 - lxml
 - matplotlib
 - moviepy
 - msgpack-numpy
 - msgpack-python
-- numexpr
 - numpy
 - opencv
 - openpyxl
 - pandas
 - pillow
-- pip<19.0
+- pip!=19.0,!=19.0.1,!=19.0.2
 - psutil
+- pyglet>=1.3,<1.4
 - pyopengl
 - pyosf
 - pyqt
 - pyserial
 - pysoundfile
+- pytables
 - pytest<4.1
 - pytest-cov
 - python-bidi
+- python-gitlab
 - python-sounddevice
 - pyyaml
 - pyzmq
 - requests
 - scipy
-- setuptools
-- sip
-- six
-- pyglet>=1.3
-- pytables
-- python-gitlab
-- urllib3
 - wheel
-- x264
-- xlrd
-- xz
-- yaml
-- lzo
 - wxpython
-- zlib
+- xlrd
 - pip:
   - pygame
   - pyparallel
diff --git a/psychopy/experiment/components/settings/__init__.py b/psychopy/experiment/components/settings/__init__.py
@@ -789,7 +789,7 @@ def writeEndCode(self, buff):
 
     def writeEndCodeJS(self, buff):
 
-        endLoopInteration = ("\nfunction endLoopIteration(thisScheduler, thisTrial) {\n"
+        endLoopInteration = ("\nfunction endLoopIteration({thisScheduler, isTrials=true}) {\n"
                     "  // ------Prepare for next entry------\n"
                     "  return function () {\n"
                     "    // ------Check if user ended loop early------\n"
@@ -799,7 +799,7 @@ def writeEndCodeJS(self, buff):
                     "        psychoJS.experiment.nextEntry();\n"
                     "      }\n"
                     "      thisScheduler.stop();\n"
-                    "    } else if (typeof thisTrial === 'undefined' || !('isTrials' in thisTrial) || thisTrial.isTrials) {\n"
+                    "    } else if (isTrials) {\n"
                     "      psychoJS.experiment.nextEntry();\n"
                     "    }\n"
                     "  return Scheduler.Event.NEXT;\n"

diff --git a/psychopy/experiment/loops.py b/psychopy/experiment/loops.py
@@ -255,14 +255,12 @@ def writeLoopStartCodeJS(self, buff, modular):
                     "    thisScheduler.add({name}LoopEnd);\n"
                     .format(params=self.params, name=thisChild.params['name'].val)
                     )
-        if self.params['isTrials'].val == True:
-            code += ("    thisScheduler.add(endLoopIteration(thisScheduler, "
-                     "{thisName}));\n".format(thisName=self.thisName))
 
-        code += ("  }\n"
-                "\n"
-                "  return Scheduler.Event.NEXT;\n"
-                "}\n")
+        code += ("    thisScheduler.add(endLoopIteration({{thisScheduler, isTrials : {isTrials}}}));\n"
+                 "  }}\n"
+                 "\n"
+                 "  return Scheduler.Event.NEXT;\n"
+                 "}}\n").format(isTrials=str(self.params['isTrials'].val).lower())
         buff.writeIndentedLines(code)
 
     def writeLoopEndCode(self, buff):

diff --git a/setup.cfg b/setup.cfg
@@ -39,7 +39,6 @@ install_requires =
     sounddevice
     python-bidi
     arabic_reshaper
-    cffi
     future
     json_tricks
     pyosf