Merge branch 'quickfix'

appyter/VERSION

@@ -1 +1 @@
-0.19.21
+0.19.22

appyter/execspec/implementations/subprocess.py

@@ -25,12 +25,9 @@ async def _submit(self, **job):
       job['ipynb'],
       stderr=sys.stderr,
       env=dict(
-        SYSTEMROOT=os.environ.get('SYSTEMROOT', ''),
-        HOME=os.environ.get('HOME', ''),
-        USERPROFILE=os.environ.get('USERPROFILE', ''),
-        PYTHONUTF8='1',
+        os.environ,
+        { k: v for k, v in os.environ.items() if not k.startswith('APPYTER_') },
         PYTHONPATH=':'.join(sys.path),
-        PATH=os.environ['PATH'],
       ),
     ):
       yield msg, done

appyter/helpers/serve.py

@@ -51,11 +51,7 @@ def serve(data_dir, cwd, host, port, args):
       ],
       stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr,
       cwd=tmp.resolve(),
-      env=dict(os.environ,
-        PYTHONUTF8='1',
-        PYTHONPATH=':'.join(sys.path),
-        PATH=os.environ['PATH']
-      ),
+      env=dict(os.environ, PYTHONPATH=':'.join(sys.path)),
     )
     exit_code = None
     while exit_code is None:

appyter/profiles/default/templates/production/supervisord.conf.j2

@@ -24,8 +24,6 @@ startsecs=1
 startretries=3
 autostart=true
 autorestart=true
-{#- NOTE: a `'` anywhere in `v` would cause an issue, we should come up with a way around this #}
-environment={% for k, v in _config.items() %}{% if v is not none %}{{ k }}='{{ v|jsonify }}'{% if not loop.last %},{% endif %}{% endif %}{% endfor %}
 command={{ sys.executable }} -u -m appyter --socket={{ str(_tmp_dir/'%(program_name)s_%(process_num)d.sock') }}
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0

appyter/render/flask_app/development.py

@@ -12,7 +12,7 @@ async def run_app(config):
     f"--socket={config['HOST']}:{config['PORT']}",
     stdout=sys.stdout,
     stderr=sys.stderr,
-    env=dict(os.environ),
+    env=os.environ,
   )
 
 async def app_runner(emitter, config):

appyter/render/flask_app/production.py

@@ -34,12 +34,19 @@ def serve(app_path, **kwargs):
     #
     logger.info(f"Generating production config...")
     with (tmp_dir/'supervisord.conf').open('w') as fw:
-      env.get_template('production/supervisord.conf.j2').stream(_tmp_dir=tmp_dir, sys=sys, str=str).dump(fw)
+      env.get_template('production/supervisord.conf.j2').stream(
+        _tmp_dir=tmp_dir,
+        list=list,
+        str=str,
+        sys=sys,
+      ).dump(fw)
     with (tmp_dir/'nginx.conf').open('w') as fw:
       env.get_template('production/nginx.conf.j2').stream(
-        _tmp_dir=tmp_dir, os=os, str=str,
-        get_appyter_directory=get_appyter_directory,
+        _tmp_dir=tmp_dir,
         find_blueprints=find_blueprints,
+        get_appyter_directory=get_appyter_directory,
+        os=os,
+        str=str,
       ).dump(fw)
     logger.info(f"Starting production instance at http://{config['HOST']}:{config['PORT']}{config['PREFIX']}/ ...")
     with Popen(['supervisord', '-n', '-c', str(tmp_dir/'supervisord.conf')], env=os.environ) as proc:

appyter/render/nbexecute.py

@@ -98,12 +98,8 @@ async def nbexecute_async(ipynb='', emit=json_emitter_factory(sys.stdout), cwd='
           await emit({ 'type': 'nb', 'data': nb_to_json(nb) })
           async with client.async_setup_kernel(
             env=dict(
-              SYSTEMROOT=os.environ.get('SYSTEMROOT', ''),
-              HOME=str(mnt),
-              USERPROFILE=str(mnt),
-              PYTHONUTF8='1',
+              { k: v for k, v in os.environ.items() if not k.startswith('APPYTER_') },
               PYTHONPATH=':'.join(sys.path),
-              PATH=os.environ['PATH'],
             ),
           ):
             logger.info('executing')