ipc issue, add binstar steps

.binstar.yml

@@ -13,6 +13,8 @@ engine:
   - python=3.5
 
 script:
+  - conda install conda conda-build -y -n root
+  - conda clean -y -all  
   - conda build conda.recipe
 
 build_targets: conda

.dockerignore

@@ -10,3 +10,4 @@ nbpresent/static/nbpresent/
 node_modules/
 *.xunit.xml
 .coverage
+*.log

Dockerfile

@@ -3,8 +3,8 @@ FROM continuumio/miniconda
 RUN apt-get install -y libfreetype6-dev libfontconfig1-dev
 
 RUN conda install -yq \
-  conda-build==1.19 \
-  conda==3.19.1
+  conda-build>=1.20.3 \
+  conda>=4.0.6
 
 COPY ./environment.yml /tmp/environment.yml
 RUN conda env update --file /tmp/environment.yml
@@ -15,13 +15,8 @@ COPY . /src/nbpresent
 
 WORKDIR /src/nbpresent
 
-RUN conda build \
-    conda.recipe \
-    -c anaconda-nb-extensions \
-    -c bokeh \
-    -c cpcloud \
-    -c javascript \
-    -c mutirri \
-    -c wakari
+RUN conda build conda.recipe -c=conda-forge --python=2.7
+RUN conda build conda.recipe -c=conda-forge --python=3.4
+RUN conda build conda.recipe -c=conda-forge --python=3.5
 
-CMD ["/usr/bin/bash"]
+CMD ["/bin/bash"]

conda.recipe/meta.yaml

@@ -1,28 +1,23 @@
 package:
   name: nbpresent
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+  version: "3.0.2"
 
 source:
-  git_url: ../
+  path: ../
 
 build:
-  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
-  {% if environ.get('GIT_DESCRIBE_NUMBER', '0') == '0' %}string: py{{ environ.get('PY_VER').replace('.', '') }}_0
-  {% else %}string: py{{ environ.get('PY_VER').replace('.', '') }}_{{ environ.get('GIT_BUILD_STR', 'GIT_STUB') }}{% endif %}
-
+  number: 1
 
 requirements:
   build:
     - nodejs
     - notebook >=4.2.0
-    - python 2.7*|3.4*|3.5*
+    - python
     - setuptools
-    - vs2008_runtime # [win64]
-    - vs2015_runtime # [win64]
 
   run:
     - notebook >=4.2.0
-    - python 2.7*|3.4*|3.5*
+    - python
 
 test:
   files:
@@ -35,13 +30,11 @@ test:
     - nodejs
     - nose
     - notebook >=4.2.0
-    - python 2.7*|3.4*|3.5*
+    - python
     - requests
     - fontconfig # [linux]
     - freetype # [linux]
     - mock # [py2k]
-    - vs2008_runtime # [win64]
-    - vs2015_runtime # [win64]
 
 about:
   summary: Next generation slides for Jupyter Notebooks

conda.recipe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbpresent-conda-test",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {

nbpresent/_version.py

@@ -1,2 +1,2 @@
-__version_info__ = (3, 0, 1)
+__version_info__ = (3, 0, 2)
 __version__ = '.'.join(map(str, __version_info__))

nbpresent/tests/test_notebook.py

@@ -125,6 +125,40 @@ def setup(self):
                 self.cmd = [
                     jstest.sys.executable, '-c', 'raise SystemExit(1)']
 
+    def _init_server(self):
+        "Start the notebook server in a separate process"
+        self.server_command = command = [
+            jstest.sys.executable,
+            '-m', 'notebook',
+            '--no-browser',
+            '--notebook-dir', self.nbdir.name,
+            '--NotebookApp.base_url=%s' % self.base_url,
+        ]
+        # ipc doesn't work on Windows, and darwin has crazy-long temp paths,
+        # which run afoul of ipc's maximum path length.
+        # if jstest.sys.platform.startswith('linux'):
+        #     command.append('--KernelManager.transport=ipc')
+        self.stream_capturer = c = jstest.StreamCapturer()
+        c.start()
+        env = os.environ.copy()
+        env.update(self.env)
+        # if self.engine == 'phantomjs':
+        #     env['IPYTHON_ALLOW_DRAFT_WEBSOCKETS_FOR_PHANTOMJS'] = '1'
+        self.server = subprocess.Popen(
+            command,
+            stdout=c.writefd,
+            stderr=jstest.subprocess.STDOUT,
+            cwd=self.nbdir.name,
+            env=env,
+        )
+        with patch.dict('os.environ', {'HOME': self.home.name}):
+            runtime_dir = jstest.jupyter_runtime_dir()
+        self.server_info_file = os.path.join(
+            runtime_dir,
+            'nbserver-%i.json' % self.server.pid
+        )
+        self._wait_for_server()
+
     def add_xunit(self):
         """ Hack the setup in the middle (after paths, before server)
         """

package.json

@@ -85,5 +85,5 @@
     "watch": "watch 'npm run build:dev' src",
     "watch:test": "watch 'npm run test' ./nbpresent/static/nbpresent/js"
   },
-  "version": "3.0.1"
+  "version": "3.0.2"
 }