Skip to content
This repository has been archived by the owner on Sep 8, 2019. It is now read-only.

Commit

Permalink
Fixing python3 packaging (all dependencies were not auto-detected)
Browse files Browse the repository at this point in the history
  • Loading branch information
@synchrone
synchrone committed Feb 10, 2016
1 parent 5a046ba commit 9ae8aea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 265 deletions.
264 changes: 0 additions & 264 deletions .sandstorm/sandstorm-files.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,19 @@
# expect comments or ordering to be retained.
bin/bash
bin/cat
bin/chmod
bin/dash
bin/hostname
bin/mkdir
bin/rm
bin/sed
bin/sh
bin/sleep
etc/alternatives/uwsgi
etc/alternatives/uwsgi-plugin-python
etc/alternatives/uwsgi-plugin-python3
etc/group
etc/ld.so.cache
etc/localtime
etc/mime.types
etc/nginx/conf.d
etc/nginx/mime.types
etc/nginx/nginx.conf
etc/nginx/sites-enabled
etc/nginx/uwsgi_params
etc/python2.7/sitecustomize.py
etc/radicale/config
etc/radicale/rights
etc/ssl/openssl.cnf
Expand All @@ -45,7 +37,6 @@ lib/x86_64-linux-gnu/libdl-2.19.so
lib/x86_64-linux-gnu/libdl.so.2
lib/x86_64-linux-gnu/libexpat.so.1
lib/x86_64-linux-gnu/libexpat.so.1.6.0
lib/x86_64-linux-gnu/libgcc_s.so.1
lib/x86_64-linux-gnu/libgcrypt.so.20
lib/x86_64-linux-gnu/libgcrypt.so.20.0.3
lib/x86_64-linux-gnu/libgpg-error.so.0
Expand Down Expand Up @@ -81,61 +72,14 @@ lib/x86_64-linux-gnu/libutil-2.19.so
lib/x86_64-linux-gnu/libutil.so.1
lib/x86_64-linux-gnu/libuuid.so.1
lib/x86_64-linux-gnu/libuuid.so.1.3.0
lib/x86_64-linux-gnu/libwrap.so.0
lib/x86_64-linux-gnu/libwrap.so.0.7.6
lib/x86_64-linux-gnu/libz.so.1
lib/x86_64-linux-gnu/libz.so.1.2.8
lib64/ld-linux-x86-64.so.2
opt/app/.sandstorm/launcher.sh
opt/app/.sandstorm/new-instance.sh
opt/app/api-offer
opt/app/api-offer/inf-it-integration.css
opt/app/api-offer/inf-it-integration.js
opt/app/api-offer/jquery-ui-dialog-only.js
opt/app/caldav.nginx.conf
opt/app/carddav.nginx.conf
opt/app/env/bin/python
opt/app/env/lib/python2.7/UserDict.py
opt/app/env/lib/python2.7/UserDict.pyc
opt/app/env/lib/python2.7/_abcoll.py
opt/app/env/lib/python2.7/_abcoll.pyc
opt/app/env/lib/python2.7/_weakrefset.py
opt/app/env/lib/python2.7/_weakrefset.pyc
opt/app/env/lib/python2.7/abc.py
opt/app/env/lib/python2.7/abc.pyc
opt/app/env/lib/python2.7/codecs.py
opt/app/env/lib/python2.7/codecs.pyc
opt/app/env/lib/python2.7/copy_reg.py
opt/app/env/lib/python2.7/copy_reg.pyc
opt/app/env/lib/python2.7/encodings
opt/app/env/lib/python2.7/genericpath.py
opt/app/env/lib/python2.7/genericpath.pyc
opt/app/env/lib/python2.7/lib-dynload
opt/app/env/lib/python2.7/linecache.py
opt/app/env/lib/python2.7/linecache.pyc
opt/app/env/lib/python2.7/no-global-site-packages.txt
opt/app/env/lib/python2.7/orig-prefix.txt
opt/app/env/lib/python2.7/os.py
opt/app/env/lib/python2.7/os.pyc
opt/app/env/lib/python2.7/posixpath.py
opt/app/env/lib/python2.7/posixpath.pyc
opt/app/env/lib/python2.7/re.py
opt/app/env/lib/python2.7/re.pyc
opt/app/env/lib/python2.7/site-packages
opt/app/env/lib/python2.7/site.py
opt/app/env/lib/python2.7/site.pyc
opt/app/env/lib/python2.7/sre_compile.py
opt/app/env/lib/python2.7/sre_compile.pyc
opt/app/env/lib/python2.7/sre_constants.py
opt/app/env/lib/python2.7/sre_constants.pyc
opt/app/env/lib/python2.7/sre_parse.py
opt/app/env/lib/python2.7/sre_parse.pyc
opt/app/env/lib/python2.7/stat.py
opt/app/env/lib/python2.7/stat.pyc
opt/app/env/lib/python2.7/types.py
opt/app/env/lib/python2.7/types.pyc
opt/app/env/lib/python2.7/warnings.py
opt/app/env/lib/python2.7/warnings.pyc
opt/app/env/lib/python3.4
opt/app/env/lib/python3.4/__pycache__/_bootlocale.cpython-34.pyc
opt/app/env/lib/python3.4/__pycache__/_collections_abc.cpython-34.pyc
Expand Down Expand Up @@ -233,24 +177,11 @@ opt/app/env/lib/python3.4/tokenize.py
opt/app/env/lib/python3.4/types.py
opt/app/env/lib/python3.4/warnings.py
opt/app/env/lib/python3.4/weakref.py
opt/app/env/local/lib
opt/app/infcloud/addressbook.js
opt/app/infcloud/cache.manifest
opt/app/infcloud/cache_handler.js
opt/app/infcloud/caldavzap.config.js
opt/app/infcloud/carddavmate.config.js
opt/app/infcloud/common.js
opt/app/infcloud/compressed.css
opt/app/infcloud/compressed.js
opt/app/infcloud/css/default.css
opt/app/infcloud/css/default_ie.css
opt/app/infcloud/css/default_integration.css
opt/app/infcloud/css/fullcalendar.css
opt/app/infcloud/css/hideresources.css
opt/app/infcloud/css/jquery-ui.custom.css
opt/app/infcloud/css/jquery.tagsinput.css
opt/app/infcloud/css/spectrum.custom.css
opt/app/infcloud/data_process.js
opt/app/infcloud/fonts/Roboto-Bold-webfont.eot
opt/app/infcloud/fonts/Roboto-Bold-webfont.svg
opt/app/infcloud/fonts/Roboto-Bold-webfont.ttf
Expand Down Expand Up @@ -283,7 +214,6 @@ opt/app/infcloud/fonts/Roboto-Regular-webfont.eot
opt/app/infcloud/fonts/Roboto-Regular-webfont.svg
opt/app/infcloud/fonts/Roboto-Regular-webfont.ttf
opt/app/infcloud/fonts/Roboto-Regular-webfont.woff
opt/app/infcloud/forms.js
opt/app/infcloud/images/add_cal.svg
opt/app/infcloud/images/add_cal_white.svg
opt/app/infcloud/images/arrow.svg
Expand Down Expand Up @@ -379,28 +309,6 @@ opt/app/infcloud/images/success_w.svg
opt/app/infcloud/images/todoB.svg
opt/app/infcloud/images/user.svg
opt/app/infcloud/index.html
opt/app/infcloud/interface.js
opt/app/infcloud/lib/fullcalendar.js
opt/app/infcloud/lib/ie_base64.js
opt/app/infcloud/lib/jquery-2.1.4.min.js
opt/app/infcloud/lib/jquery-ui-1.11.4.custom.js
opt/app/infcloud/lib/jquery.autosize.js
opt/app/infcloud/lib/jquery.browser.js
opt/app/infcloud/lib/jquery.placeholder-1.1.9.js
opt/app/infcloud/lib/jquery.quicksearch.js
opt/app/infcloud/lib/jquery.tagsinput.js
opt/app/infcloud/lib/jshash-2.2_sha256.js
opt/app/infcloud/lib/rrule.js
opt/app/infcloud/lib/spectrum.js
opt/app/infcloud/localization.js
opt/app/infcloud/main.js
opt/app/infcloud/resource.js
opt/app/infcloud/timezones.js
opt/app/infcloud/vcalendar.js
opt/app/infcloud/vcalendar_rfc_regex.js
opt/app/infcloud/vcard_rfc_regex.js
opt/app/infcloud/vtodo.js
opt/app/infcloud/webdav_protocol.js
opt/app/main.py
opt/app/radicale.config
opt/app/radicale.rights
Expand All @@ -412,172 +320,6 @@ sbin/ldconfig
sbin/ldconfig.real
usr/bin/uwsgi
usr/bin/uwsgi-core
usr/lib/pymodules/python2.7/.path
usr/lib/python2.7/BaseHTTPServer.py
usr/lib/python2.7/BaseHTTPServer.pyc
usr/lib/python2.7/ConfigParser.py
usr/lib/python2.7/ConfigParser.pyc
usr/lib/python2.7/SocketServer.py
usr/lib/python2.7/SocketServer.pyc
usr/lib/python2.7/StringIO.py
usr/lib/python2.7/StringIO.pyc
usr/lib/python2.7/UserDict.py
usr/lib/python2.7/UserDict.pyc
usr/lib/python2.7/__future__.py
usr/lib/python2.7/__future__.pyc
usr/lib/python2.7/_abcoll.py
usr/lib/python2.7/_abcoll.pyc
usr/lib/python2.7/_sysconfigdata.py
usr/lib/python2.7/_sysconfigdata.pyc
usr/lib/python2.7/_weakrefset.py
usr/lib/python2.7/_weakrefset.pyc
usr/lib/python2.7/abc.py
usr/lib/python2.7/abc.pyc
usr/lib/python2.7/atexit.py
usr/lib/python2.7/atexit.pyc
usr/lib/python2.7/base64.py
usr/lib/python2.7/base64.pyc
usr/lib/python2.7/codecs.py
usr/lib/python2.7/codecs.pyc
usr/lib/python2.7/collections.py
usr/lib/python2.7/collections.pyc
usr/lib/python2.7/contextlib.py
usr/lib/python2.7/contextlib.pyc
usr/lib/python2.7/copy_reg.py
usr/lib/python2.7/copy_reg.pyc
usr/lib/python2.7/ctypes/__init__.py
usr/lib/python2.7/ctypes/__init__.pyc
usr/lib/python2.7/ctypes/_endian.py
usr/lib/python2.7/ctypes/_endian.pyc
usr/lib/python2.7/ctypes/util.py
usr/lib/python2.7/ctypes/util.pyc
usr/lib/python2.7/dist-packages
usr/lib/python2.7/dist-packages/python-support.pth
usr/lib/python2.7/encodings/__init__.py
usr/lib/python2.7/encodings/__init__.pyc
usr/lib/python2.7/encodings/aliases.py
usr/lib/python2.7/encodings/aliases.pyc
usr/lib/python2.7/encodings/ascii.py
usr/lib/python2.7/encodings/ascii.pyc
usr/lib/python2.7/encodings/hex_codec.py
usr/lib/python2.7/encodings/hex_codec.pyc
usr/lib/python2.7/encodings/utf_8.py
usr/lib/python2.7/encodings/utf_8.pyc
usr/lib/python2.7/functools.py
usr/lib/python2.7/functools.pyc
usr/lib/python2.7/genericpath.py
usr/lib/python2.7/genericpath.pyc
usr/lib/python2.7/hashlib.py
usr/lib/python2.7/hashlib.pyc
usr/lib/python2.7/heapq.py
usr/lib/python2.7/heapq.pyc
usr/lib/python2.7/httplib.py
usr/lib/python2.7/httplib.pyc
usr/lib/python2.7/io.py
usr/lib/python2.7/io.pyc
usr/lib/python2.7/json/__init__.py
usr/lib/python2.7/json/__init__.pyc
usr/lib/python2.7/json/decoder.py
usr/lib/python2.7/json/decoder.pyc
usr/lib/python2.7/json/encoder.py
usr/lib/python2.7/json/encoder.pyc
usr/lib/python2.7/json/scanner.py
usr/lib/python2.7/json/scanner.pyc
usr/lib/python2.7/keyword.py
usr/lib/python2.7/keyword.pyc
usr/lib/python2.7/lib-dynload/_ctypes.x86_64-linux-gnu.so
usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so
usr/lib/python2.7/lib-dynload/_json.x86_64-linux-gnu.so
usr/lib/python2.7/lib-dynload/_ssl.x86_64-linux-gnu.so
usr/lib/python2.7/lib-dynload/pyexpat.x86_64-linux-gnu.so
usr/lib/python2.7/linecache.py
usr/lib/python2.7/linecache.pyc
usr/lib/python2.7/logging/__init__.py
usr/lib/python2.7/logging/__init__.pyc
usr/lib/python2.7/logging/config.py
usr/lib/python2.7/logging/config.pyc
usr/lib/python2.7/logging/handlers.py
usr/lib/python2.7/logging/handlers.pyc
usr/lib/python2.7/mimetools.py
usr/lib/python2.7/mimetools.pyc
usr/lib/python2.7/os.py
usr/lib/python2.7/os.pyc
usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py
usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.pyc
usr/lib/python2.7/posixpath.py
usr/lib/python2.7/posixpath.pyc
usr/lib/python2.7/pprint.py
usr/lib/python2.7/pprint.pyc
usr/lib/python2.7/random.py
usr/lib/python2.7/random.pyc
usr/lib/python2.7/re.py
usr/lib/python2.7/re.pyc
usr/lib/python2.7/rfc822.py
usr/lib/python2.7/rfc822.pyc
usr/lib/python2.7/site.py
usr/lib/python2.7/site.pyc
usr/lib/python2.7/sitecustomize.py
usr/lib/python2.7/sitecustomize.pyc
usr/lib/python2.7/socket.py
usr/lib/python2.7/socket.pyc
usr/lib/python2.7/sre_compile.py
usr/lib/python2.7/sre_compile.pyc
usr/lib/python2.7/sre_constants.py
usr/lib/python2.7/sre_constants.pyc
usr/lib/python2.7/sre_parse.py
usr/lib/python2.7/sre_parse.pyc
usr/lib/python2.7/ssl.py
usr/lib/python2.7/ssl.pyc
usr/lib/python2.7/stat.py
usr/lib/python2.7/stat.pyc
usr/lib/python2.7/string.py
usr/lib/python2.7/string.pyc
usr/lib/python2.7/struct.py
usr/lib/python2.7/struct.pyc
usr/lib/python2.7/sysconfig.py
usr/lib/python2.7/sysconfig.pyc
usr/lib/python2.7/tempfile.py
usr/lib/python2.7/tempfile.pyc
usr/lib/python2.7/textwrap.py
usr/lib/python2.7/textwrap.pyc
usr/lib/python2.7/threading.py
usr/lib/python2.7/threading.pyc
usr/lib/python2.7/traceback.py
usr/lib/python2.7/traceback.pyc
usr/lib/python2.7/types.py
usr/lib/python2.7/types.pyc
usr/lib/python2.7/urllib.py
usr/lib/python2.7/urllib.pyc
usr/lib/python2.7/urlparse.py
usr/lib/python2.7/urlparse.pyc
usr/lib/python2.7/uuid.py
usr/lib/python2.7/uuid.pyc
usr/lib/python2.7/warnings.py
usr/lib/python2.7/warnings.pyc
usr/lib/python2.7/weakref.py
usr/lib/python2.7/weakref.pyc
usr/lib/python2.7/wsgiref/__init__.py
usr/lib/python2.7/wsgiref/__init__.pyc
usr/lib/python2.7/wsgiref/handlers.py
usr/lib/python2.7/wsgiref/handlers.pyc
usr/lib/python2.7/wsgiref/headers.py
usr/lib/python2.7/wsgiref/headers.pyc
usr/lib/python2.7/wsgiref/simple_server.py
usr/lib/python2.7/wsgiref/simple_server.pyc
usr/lib/python2.7/wsgiref/util.py
usr/lib/python2.7/wsgiref/util.pyc
usr/lib/python2.7/xml/__init__.py
usr/lib/python2.7/xml/__init__.pyc
usr/lib/python2.7/xml/etree/ElementPath.py
usr/lib/python2.7/xml/etree/ElementPath.pyc
usr/lib/python2.7/xml/etree/ElementTree.py
usr/lib/python2.7/xml/etree/ElementTree.pyc
usr/lib/python2.7/xml/etree/__init__.py
usr/lib/python2.7/xml/etree/__init__.pyc
usr/lib/python2.7/xml/parsers/__init__.py
usr/lib/python2.7/xml/parsers/__init__.pyc
usr/lib/python2.7/xml/parsers/expat.py
usr/lib/python2.7/xml/parsers/expat.pyc
usr/lib/python3.4
usr/lib/python3.4/__pycache__/_compat_pickle.cpython-34.pyc
usr/lib/python3.4/__pycache__/argparse.cpython-34.pyc
Expand Down Expand Up @@ -676,10 +418,8 @@ usr/lib/python3.4/xml/etree/__pycache__/ElementPath.cpython-34.pyc
usr/lib/python3.4/xml/etree/__pycache__/ElementTree.cpython-34.pyc
usr/lib/python3.4/xml/etree/__pycache__/__init__.cpython-34.pyc
usr/lib/ssl/openssl.cnf
usr/lib/uwsgi/plugins/python27_plugin.so
usr/lib/uwsgi/plugins/python34_plugin.so
usr/lib/uwsgi/plugins/python3_plugin.so
usr/lib/uwsgi/plugins/python_plugin.so
usr/lib/x86_64-linux-gnu/libGeoIP.so.1
usr/lib/x86_64-linux-gnu/libGeoIP.so.1.6.2
usr/lib/x86_64-linux-gnu/libX11.so.6
Expand All @@ -706,11 +446,8 @@ usr/lib/x86_64-linux-gnu/libjansson.so.4.7.0
usr/lib/x86_64-linux-gnu/libjbig.so.0
usr/lib/x86_64-linux-gnu/libjpeg.so.62
usr/lib/x86_64-linux-gnu/libjpeg.so.62.1.0
usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0
usr/lib/x86_64-linux-gnu/libpython3.4m.so.1.0
usr/lib/x86_64-linux-gnu/libssl.so.1.0.0
usr/lib/x86_64-linux-gnu/libstdc++.so.6
usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
usr/lib/x86_64-linux-gnu/libtiff.so.5
usr/lib/x86_64-linux-gnu/libtiff.so.5.2.0
usr/lib/x86_64-linux-gnu/libvpx.so.1
Expand All @@ -723,5 +460,4 @@ usr/lib/x86_64-linux-gnu/libxslt.so.1
usr/lib/x86_64-linux-gnu/libxslt.so.1.1.28
usr/lib/x86_64-linux-gnu/libyaml-0.so.2
usr/lib/x86_64-linux-gnu/libyaml-0.so.2.0.4
usr/local/lib/python2.7/dist-packages
usr/sbin/nginx
6 changes: 5 additions & 1 deletion .sandstorm/sandstorm-pkgdef.capnp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,11 @@ const pkgdef :Spk.PackageDefinition = (
# `spk dev` will write a list of all the files your app uses to this file.
# You should review it later, before shipping your app.

alwaysInclude = [],
alwaysInclude = [
"opt/app/env",
"usr/lib/python3.4", # pull in the whole Python 3 runtime
"usr/lib/python3", # pull in any Debian pure-Python packages

This comment has been minimized.

Sign in to view

Copy link
@paulproteus

paulproteus Feb 12, 2016

+1, I'm glad you were able to overcome that packaging issue.

I'm going to run into it, too, with my other Python apps, so IMHO it's important that we (Sandstorm team) add some better handling for this. I'll see what we can do.
],
# Fill this list with more names of files or directories that should be
# included in your package, even if not listed in sandstorm-files.list.
# Use this to force-include stuff that you know you need but which may
Expand Down

0 comments on commit 9ae8aea

Please sign in to comment.