Revert setup.py related changes from #1358

.dockerignore

@@ -1,3 +1,2 @@
 helm-chart
 !helm-chart/images
-!helm-chart/binderhub/values.yaml

.gitignore

@@ -115,6 +115,3 @@ helm.txt
 # Federation data page
 doc/federation/data-federation.txt
 .vscode/
-
-# Autogenerated
-binderhub/binderspawner_mixin.py

MANIFEST.in

@@ -6,4 +6,3 @@ graft doc
 include LICENSE
 include versioneer.py
 include binderhub/_version.py
-include helm-chart/binderhub/values.yaml

helm-chart/images/binderhub/Dockerfile

@@ -24,8 +24,7 @@ WORKDIR /tmp/binderhub
 
 # Build the binderhub python library into a wheel and save it to the ./dist
 # folder. There are no pycurl wheels so we build our own in the build stage.
-RUN pip install pyyaml && \
-    python setup.py bdist_wheel
+RUN python setup.py bdist_wheel
 RUN pip wheel pycurl --wheel-dir ./dist
 
 

setup.py

@@ -2,7 +2,6 @@
 
 from setuptools import setup, find_packages
 import subprocess
-import yaml
 
 import versioneer
 
@@ -28,14 +27,6 @@
     subprocess.check_call(['npm', 'install'])
     subprocess.check_call(['npm', 'run', 'webpack'])
 
-# FIXME: See helm-chart/binderhub/values.yaml for a betterlong term fix
-binderspawner_mixin_py = os.path.join(here, 'binderhub', 'binderspawner_mixin.py')
-values_yaml = os.path.join(here, 'helm-chart', 'binderhub', 'values.yaml')
-with open(values_yaml) as f:
-    values = yaml.safe_load(f)
-with open(binderspawner_mixin_py, 'w') as f:
-    f.write(values['jupyterhub']['hub']['extraConfig']['0-binderspawnermixin'])
-
 setup(
     name='binderhub',
     version=versioneer.get_version(),