Move xstartup file into package
Removes need for that step in postBuild
This commit is contained in:
parent
8b5bbd03a4
commit
58750b5499
|
@ -1,6 +1,8 @@
|
|||
import os
|
||||
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
def setup_desktop():
|
||||
VNC_APPLICATION_DIR = os.path.join(os.getenv('CONDA_DIR'), 'vnc')
|
||||
return {
|
||||
|
@ -13,7 +15,7 @@ def setup_desktop():
|
|||
'--',
|
||||
VNC_APPLICATION_DIR + '/bin/vncserver',
|
||||
'-verbose',
|
||||
'-xstartup', VNC_APPLICATION_DIR + '/xstartup',
|
||||
'-xstartup', os.path.join(HERE, 'share/xstartup'),
|
||||
'-geometry', '1024x768',
|
||||
'-SecurityTypes', 'None',
|
||||
'-rfbunixpath', VNC_APPLICATION_DIR + '/socket',
|
|
@ -25,7 +25,4 @@ sed -i.bak \
|
|||
noVNC-1.1.0/vnc_lite.html
|
||||
|
||||
|
||||
cp $REPO_DIR/share/xstartup .
|
||||
chmod +x xstartup
|
||||
|
||||
pip install $REPO_DIR
|
13
setup.py
13
setup.py
|
@ -1,17 +1,16 @@
|
|||
import setuptools
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
|
||||
setuptools.setup(
|
||||
setup(
|
||||
name="jupyter-desktop-server",
|
||||
# py_modules rather than packages, since we only have 1 file
|
||||
py_modules=['jupyter_desktop'],
|
||||
packages=find_packages(),
|
||||
version='0.1',
|
||||
entry_points={
|
||||
'jupyter_serverproxy_servers': [
|
||||
'desktop = jupyter_desktop:setup_desktop',
|
||||
]
|
||||
},
|
||||
install_requires=['jupyter-server-proxy'],
|
||||
package_data={
|
||||
'jupyter_desktop': ['desktop/*'],
|
||||
},
|
||||
include_package_data=True,
|
||||
zip_safe=False
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue