diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..3b5d64e63 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include CONTRIBUTING +include COPYING +include INSTALL +include README +recursive-include docs * diff --git a/install_config b/install_config new file mode 120000 index 000000000..0273bcaa1 --- /dev/null +++ b/install_config @@ -0,0 +1 @@ +sapling/etc/install_config \ No newline at end of file diff --git a/install_config/daisydiff.war b/install_config/daisydiff.war deleted file mode 120000 index b18490038..000000000 --- a/install_config/daisydiff.war +++ /dev/null @@ -1 +0,0 @@ -../sapling/versionutils/diff/daisydiff/daisydiff.war \ No newline at end of file diff --git a/media/.gitignore b/media/.gitignore deleted file mode 100644 index 8236f2b23..000000000 --- a/media/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Don't commit anything, this is the media folder -* diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..0c2a30d3d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,14 @@ +setuptools +django>=1.3 +html5lib>=0.90 +Sphinx>=1.0.7 +sorl-thumbnail>=11.01 +python-dateutil>=1.5 +pysolr +django-haystack +django-randomfilenamestorage +django-guardian +South +django-staticfiles>=1.1.2 +https://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz#egg=django-registration +-e git+git://github.com/philipn/olwidget.git@custom_base_layers_fixed#egg=django-olwidget diff --git a/sapling/etc/install_config/daisydiff.war b/sapling/etc/install_config/daisydiff.war new file mode 120000 index 000000000..9d010010c --- /dev/null +++ b/sapling/etc/install_config/daisydiff.war @@ -0,0 +1 @@ +../../versionutils/diff/daisydiff/daisydiff.war \ No newline at end of file diff --git a/install_config/defaults/README b/sapling/etc/install_config/defaults/README similarity index 100% rename from install_config/defaults/README rename to sapling/etc/install_config/defaults/README diff --git a/install_config/defaults/localwiki/README b/sapling/etc/install_config/defaults/localwiki/README similarity index 100% rename from install_config/defaults/localwiki/README rename to sapling/etc/install_config/defaults/localwiki/README diff --git a/install_config/defaults/localwiki/VERSION b/sapling/etc/install_config/defaults/localwiki/VERSION similarity index 100% rename from install_config/defaults/localwiki/VERSION rename to sapling/etc/install_config/defaults/localwiki/VERSION diff --git a/install_config/defaults/localwiki/conf/localsettings.py b/sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template similarity index 100% rename from install_config/defaults/localwiki/conf/localsettings.py rename to sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template diff --git a/install_config/defaults/localwiki/media/.gitignore b/sapling/etc/install_config/defaults/localwiki/media/.gitignore similarity index 100% rename from install_config/defaults/localwiki/media/.gitignore rename to sapling/etc/install_config/defaults/localwiki/media/.gitignore diff --git a/install_config/defaults/localwiki/static/.gitignore b/sapling/etc/install_config/defaults/localwiki/media/null similarity index 100% rename from install_config/defaults/localwiki/static/.gitignore rename to sapling/etc/install_config/defaults/localwiki/media/null diff --git a/install_config/defaults/localwiki/templates/.gitignore b/sapling/etc/install_config/defaults/localwiki/static/.gitignore similarity index 100% rename from install_config/defaults/localwiki/templates/.gitignore rename to sapling/etc/install_config/defaults/localwiki/static/.gitignore diff --git a/install_config/defaults/localwiki/themes/.gitignore b/sapling/etc/install_config/defaults/localwiki/static/null similarity index 100% rename from install_config/defaults/localwiki/themes/.gitignore rename to sapling/etc/install_config/defaults/localwiki/static/null diff --git a/sapling/etc/install_config/defaults/localwiki/templates/null b/sapling/etc/install_config/defaults/localwiki/templates/null new file mode 100644 index 000000000..e69de29bb diff --git a/sapling/etc/install_config/defaults/localwiki/themes/.gitignore b/sapling/etc/install_config/defaults/localwiki/themes/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/install_config/postgis_template_scripts/create_template_postgis-1.3.sh b/sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.3.sh similarity index 100% rename from install_config/postgis_template_scripts/create_template_postgis-1.3.sh rename to sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.3.sh diff --git a/install_config/postgis_template_scripts/create_template_postgis-1.4.sh b/sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.4.sh similarity index 100% rename from install_config/postgis_template_scripts/create_template_postgis-1.4.sh rename to sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.4.sh diff --git a/install_config/postgis_template_scripts/create_template_postgis-1.5.sh b/sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.5.sh similarity index 100% rename from install_config/postgis_template_scripts/create_template_postgis-1.5.sh rename to sapling/etc/install_config/postgis_template_scripts/create_template_postgis-1.5.sh diff --git a/install_config/postgis_template_scripts/create_template_postgis-debian.sh b/sapling/etc/install_config/postgis_template_scripts/create_template_postgis-debian.sh similarity index 100% rename from install_config/postgis_template_scripts/create_template_postgis-debian.sh rename to sapling/etc/install_config/postgis_template_scripts/create_template_postgis-debian.sh diff --git a/install_config/setup_jetty.sh b/sapling/etc/install_config/setup_jetty.sh similarity index 100% rename from install_config/setup_jetty.sh rename to sapling/etc/install_config/setup_jetty.sh diff --git a/install_config/solr_schema.xml b/sapling/etc/install_config/solr_schema.xml similarity index 100% rename from install_config/solr_schema.xml rename to sapling/etc/install_config/solr_schema.xml diff --git a/sapling/manage.py b/sapling/manage.py index 19116d03c..ffb9ecb6e 100755 --- a/sapling/manage.py +++ b/sapling/manage.py @@ -9,7 +9,8 @@ # We have to hard-code these here, as we run a few setup commands (in # setup_all) that execute before the settings can be safely loaded. DATA_ROOT = os.path.join(sys.prefix, 'share', 'localwiki') -PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..') +PROJECT_ROOT = os.path.split(os.path.abspath(__file__))[0] + def main(set_apps_path=True): if set_apps_path: diff --git a/sapling/settings.py b/sapling/settings.py index aa6079503..5ec05920a 100644 --- a/sapling/settings.py +++ b/sapling/settings.py @@ -15,7 +15,7 @@ MANAGERS = ADMINS DATA_ROOT = os.path.join(sys.prefix, 'share', 'localwiki') -PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..') +PROJECT_ROOT = os.path.join(os.path.dirname(__file__)) DATABASES = { 'default': { diff --git a/templates/olwidget/multi_layer_map.html b/sapling/templates/olwidget/multi_layer_map.html similarity index 100% rename from templates/olwidget/multi_layer_map.html rename to sapling/templates/olwidget/multi_layer_map.html diff --git a/templates/registration/login.html b/sapling/templates/registration/login.html similarity index 100% rename from templates/registration/login.html rename to sapling/templates/registration/login.html diff --git a/templates/registration/password_reset_complete.html b/sapling/templates/registration/password_reset_complete.html similarity index 100% rename from templates/registration/password_reset_complete.html rename to sapling/templates/registration/password_reset_complete.html diff --git a/templates/registration/password_reset_confirm.html b/sapling/templates/registration/password_reset_confirm.html similarity index 100% rename from templates/registration/password_reset_confirm.html rename to sapling/templates/registration/password_reset_confirm.html diff --git a/templates/registration/password_reset_done.html b/sapling/templates/registration/password_reset_done.html similarity index 100% rename from templates/registration/password_reset_done.html rename to sapling/templates/registration/password_reset_done.html diff --git a/templates/registration/password_reset_email.html b/sapling/templates/registration/password_reset_email.html similarity index 100% rename from templates/registration/password_reset_email.html rename to sapling/templates/registration/password_reset_email.html diff --git a/templates/registration/password_reset_form.html b/sapling/templates/registration/password_reset_form.html similarity index 100% rename from templates/registration/password_reset_form.html rename to sapling/templates/registration/password_reset_form.html diff --git a/templates/registration/registration_form.html b/sapling/templates/registration/registration_form.html similarity index 100% rename from templates/registration/registration_form.html rename to sapling/templates/registration/registration_form.html diff --git a/templates/tos/license_in_edit.html b/sapling/templates/tos/license_in_edit.html similarity index 100% rename from templates/tos/license_in_edit.html rename to sapling/templates/tos/license_in_edit.html diff --git a/templates/tos/license_on_signup.html b/sapling/templates/tos/license_on_signup.html similarity index 100% rename from templates/tos/license_on_signup.html rename to sapling/templates/tos/license_on_signup.html diff --git a/themes/README b/sapling/themes/README similarity index 100% rename from themes/README rename to sapling/themes/README diff --git a/themes/sapling/README b/sapling/themes/sapling/README similarity index 100% rename from themes/sapling/README rename to sapling/themes/sapling/README diff --git a/themes/sapling/assets/css/reset.css b/sapling/themes/sapling/assets/css/reset.css similarity index 100% rename from themes/sapling/assets/css/reset.css rename to sapling/themes/sapling/assets/css/reset.css diff --git a/themes/sapling/assets/css/site.css b/sapling/themes/sapling/assets/css/site.css similarity index 100% rename from themes/sapling/assets/css/site.css rename to sapling/themes/sapling/assets/css/site.css diff --git a/themes/sapling/assets/img/LICENSE.txt b/sapling/themes/sapling/assets/img/LICENSE.txt similarity index 100% rename from themes/sapling/assets/img/LICENSE.txt rename to sapling/themes/sapling/assets/img/LICENSE.txt diff --git a/themes/sapling/assets/img/arrow-turn-left.png b/sapling/themes/sapling/assets/img/arrow-turn-left.png similarity index 100% rename from themes/sapling/assets/img/arrow-turn-left.png rename to sapling/themes/sapling/assets/img/arrow-turn-left.png diff --git a/themes/sapling/assets/img/body-bg.png b/sapling/themes/sapling/assets/img/body-bg.png similarity index 100% rename from themes/sapling/assets/img/body-bg.png rename to sapling/themes/sapling/assets/img/body-bg.png diff --git a/themes/sapling/assets/img/footer-bg.png b/sapling/themes/sapling/assets/img/footer-bg.png similarity index 100% rename from themes/sapling/assets/img/footer-bg.png rename to sapling/themes/sapling/assets/img/footer-bg.png diff --git a/themes/sapling/assets/img/gradient.png b/sapling/themes/sapling/assets/img/gradient.png similarity index 100% rename from themes/sapling/assets/img/gradient.png rename to sapling/themes/sapling/assets/img/gradient.png diff --git a/themes/sapling/assets/img/header-bg.png b/sapling/themes/sapling/assets/img/header-bg.png similarity index 100% rename from themes/sapling/assets/img/header-bg.png rename to sapling/themes/sapling/assets/img/header-bg.png diff --git a/themes/sapling/assets/img/magnifying_glass.png b/sapling/themes/sapling/assets/img/magnifying_glass.png similarity index 100% rename from themes/sapling/assets/img/magnifying_glass.png rename to sapling/themes/sapling/assets/img/magnifying_glass.png diff --git a/themes/sapling/assets/img/map-icon-small.png b/sapling/themes/sapling/assets/img/map-icon-small.png similarity index 100% rename from themes/sapling/assets/img/map-icon-small.png rename to sapling/themes/sapling/assets/img/map-icon-small.png diff --git a/themes/sapling/assets/img/map-icon.png b/sapling/themes/sapling/assets/img/map-icon.png similarity index 100% rename from themes/sapling/assets/img/map-icon.png rename to sapling/themes/sapling/assets/img/map-icon.png diff --git a/themes/sapling/assets/pages/css/diff.css b/sapling/themes/sapling/assets/pages/css/diff.css similarity index 100% rename from themes/sapling/assets/pages/css/diff.css rename to sapling/themes/sapling/assets/pages/css/diff.css diff --git a/themes/sapling/assets/pages/css/pages.css b/sapling/themes/sapling/assets/pages/css/pages.css similarity index 100% rename from themes/sapling/assets/pages/css/pages.css rename to sapling/themes/sapling/assets/pages/css/pages.css diff --git a/themes/sapling/assets/pages/img/email_link.png b/sapling/themes/sapling/assets/pages/img/email_link.png similarity index 100% rename from themes/sapling/assets/pages/img/email_link.png rename to sapling/themes/sapling/assets/pages/img/email_link.png diff --git a/themes/sapling/assets/pages/img/external_link.png b/sapling/themes/sapling/assets/pages/img/external_link.png similarity index 100% rename from themes/sapling/assets/pages/img/external_link.png rename to sapling/themes/sapling/assets/pages/img/external_link.png diff --git a/themes/sapling/assets/pages/img/file_icons/LICENSE.txt b/sapling/themes/sapling/assets/pages/img/file_icons/LICENSE.txt similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/LICENSE.txt rename to sapling/themes/sapling/assets/pages/img/file_icons/LICENSE.txt diff --git a/themes/sapling/assets/pages/img/file_icons/document-block.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-block.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-block.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-block.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-code.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-code.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-code.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-code.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-excel.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-excel.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-excel.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-excel.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-film.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-film.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-film.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-film.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-globe.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-globe.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-globe.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-globe.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-image.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-image.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-image.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-image.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-music.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-music.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-music.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-music.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-pdf.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-pdf.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-pdf.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-pdf.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-powerpoint.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-powerpoint.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-powerpoint.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-powerpoint.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-text-image.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-text-image.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-text-image.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-text-image.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-text.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-text.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-text.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-text.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-word.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-word.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-word.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-word.png diff --git a/themes/sapling/assets/pages/img/file_icons/document-zipper.png b/sapling/themes/sapling/assets/pages/img/file_icons/document-zipper.png similarity index 100% rename from themes/sapling/assets/pages/img/file_icons/document-zipper.png rename to sapling/themes/sapling/assets/pages/img/file_icons/document-zipper.png diff --git a/themes/sapling/assets/pages/js/diff.js b/sapling/themes/sapling/assets/pages/js/diff.js similarity index 100% rename from themes/sapling/assets/pages/js/diff.js rename to sapling/themes/sapling/assets/pages/js/diff.js diff --git a/themes/sapling/templates/site/base.html b/sapling/themes/sapling/templates/site/base.html similarity index 100% rename from themes/sapling/templates/site/base.html rename to sapling/themes/sapling/templates/site/base.html diff --git a/themes/sapling/templates/site/login_info.html b/sapling/themes/sapling/templates/site/login_info.html similarity index 100% rename from themes/sapling/templates/site/login_info.html rename to sapling/themes/sapling/templates/site/login_info.html diff --git a/themes/sapling/templates/site/nav.html b/sapling/themes/sapling/templates/site/nav.html similarity index 100% rename from themes/sapling/templates/site/nav.html rename to sapling/themes/sapling/templates/site/nav.html diff --git a/themes/sapling/templates/site/search_form.html b/sapling/themes/sapling/templates/site/search_form.html similarity index 100% rename from themes/sapling/templates/site/search_form.html rename to sapling/themes/sapling/templates/site/search_form.html diff --git a/themes/sapling/templates/site/site_title.html b/sapling/themes/sapling/templates/site/site_title.html similarity index 100% rename from themes/sapling/templates/site/site_title.html rename to sapling/themes/sapling/templates/site/site_title.html diff --git a/sapling/utils/management/__init__.py b/sapling/utils/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/sapling/utils/management/commands/init_data_dir.py b/sapling/utils/management/commands/init_data_dir.py index d4423b011..6902d16d0 100644 --- a/sapling/utils/management/commands/init_data_dir.py +++ b/sapling/utils/management/commands/init_data_dir.py @@ -1,6 +1,7 @@ import sys import os import shutil +import errno class Command(object): @@ -13,20 +14,35 @@ def handle(self, *args, **kwargs): share_dir = os.path.join(sys.prefix, 'share') data_dir = os.path.join(share_dir, 'localwiki') - # Check to make sure the data directory doesn't already exist. - if os.path.exists(data_dir): - sys.stderr.write("Data directory %s already exists!\n" % data_dir) - return - # Create the data directory and copy defaults into it. if not os.path.exists(share_dir): os.makedirs(share_dir) - defaults_dir = os.path.join(self.PROJECT_ROOT, 'install_config', + + defaults_dir = os.path.join(self.PROJECT_ROOT, 'etc', 'install_config', 'defaults') - shutil.copytree(os.path.join(defaults_dir, 'localwiki'), data_dir) + + for item in os.listdir(os.path.join(defaults_dir, 'localwiki')): + if os.path.exists(os.path.join(data_dir, item)): + sys.stderr.write("Directory %s already exists! Skipping..\n" % + os.path.join(data_dir, item)) + continue + src = os.path.join(defaults_dir, 'localwiki', item) + dst = os.path.join(data_dir, item) + try: + shutil.copytree(src, dst) + except OSError as exc: + if exc.errno == errno.ENOTDIR: + shutil.copy(src, dst) + else: + raise + + # Rename localsettings.py.template to localsettings.py + os.rename(os.path.join(data_dir, 'conf', 'localsettings.py.template'), + os.path.join(data_dir, 'conf', 'localsettings.py')) print ('Created data directory in %s\n' % data_dir) + def run(DATA_ROOT=None, PROJECT_ROOT=None): c = Command() c.DATA_ROOT = DATA_ROOT diff --git a/sapling/utils/management/commands/init_db.py b/sapling/utils/management/commands/init_db.py index 790b5bb89..b9fe7ae0b 100644 --- a/sapling/utils/management/commands/init_db.py +++ b/sapling/utils/management/commands/init_db.py @@ -36,7 +36,7 @@ def create_spatial_template(self): elif which_pgis == '3': script = 'create_template_postgis-1.3.sh' - script_path = os.path.join(self.PROJECT_ROOT, + script_path = os.path.join(self.PROJECT_ROOT, 'etc', 'install_config', 'postgis_template_scripts', script) # Make a temp file so postgres user can always read it. fd, temp_path = tempfile.mkstemp() diff --git a/setup.py b/setup.py index 1265182cf..6ae66a8b8 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,6 @@ # you can't import this from another package, when you don't know if # that package is installed yet. def find_package_data( - where='.', package='', exclude=standard_exclude, exclude_directories=standard_exclude_directories, @@ -51,8 +50,6 @@ def find_package_data( Note patterns use wildcards, or can be exact paths (including leading ``./``), and all searching is case-insensitive. """ - - out = {} stack = [(convert_path(where), '', package, only_in_packages)] while stack: @@ -101,12 +98,40 @@ def find_package_data( def gen_data_files(*dirs): results = [] - for src_dir in dirs: + for dir_info in dirs: + if type(dir_info) == tuple: + src_dir, name = dir_info + else: + name = dir_info + src_dir = dir_info + top_root = None for root, dirs, files in os.walk(src_dir): - results.append((root, map(lambda f: root + "/" + f, files))) + if top_root is None: + top_root = root + root_name = root.replace(top_root, name, 1) + results.append((root_name, map(lambda f: root + "/" + f, files))) return results +install_requires = [ + 'setuptools', + 'django>=1.3', + 'html5lib>=0.90', + 'Sphinx>=1.0.7', + 'sorl-thumbnail>=11.01', + 'python-dateutil>=1.5', + 'pysolr', + 'django-haystack', + 'django-randomfilenamestorage', + 'django-guardian', + 'South', + 'django-staticfiles>=1.1.2', + 'django-registration==0.8.0-alpha-1', + 'django-olwidget==0.46-custom1', +] +if int(os.getenv('DISABLE_INSTALL_REQUIRES', '0')): + install_requires = None + setup( name='localwiki', version=get_version(), @@ -116,24 +141,11 @@ def gen_data_files(*dirs): author_email='philip@localwiki.org', packages=find_packages(), package_dir={'sapling': 'sapling'}, - data_files=gen_data_files('install_config', 'templates', 'themes'), + data_files=gen_data_files( + ('docs', 'share/localwiki/docs') + ), package_data=find_package_data(), - install_requires=[ - 'setuptools', - 'django>=1.3', - 'html5lib>=0.90', - 'Sphinx>=1.0.7', - 'sorl-thumbnail>=11.01', - 'python-dateutil==1.5', - 'pysolr', - 'django-haystack', - 'django-randomfilenamestorage', - 'django-guardian', - 'South', - 'django-staticfiles>=1.1.2', - 'django-registration==0.8.0-alpha-1', - 'django-olwidget==0.46-custom1', - ], + install_requires=install_requires, dependency_links=[ 'https://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz#egg=django-registration-0.8.0-alpha-1', 'https://github.com/philipn/olwidget/tarball/custom_base_layers_fixed#egg=django-olwidget-0.46-custom1', diff --git a/static/.gitignore b/static/.gitignore deleted file mode 100644 index 3c2fd56b6..000000000 --- a/static/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Don't commit anything, this is the static folder -* diff --git a/stdeb.cfg b/stdeb.cfg new file mode 100644 index 000000000..edd74d034 --- /dev/null +++ b/stdeb.cfg @@ -0,0 +1,3 @@ +[DEFAULT] +Depends: python-pip, python-virtualenv, python-setuptools, solr-jetty, python-lxml, python-imaging, gdal-bin, proj, postgresql-8.4-postgis, python-psycopg2 +Setup-Env-Vars: DISABLE_INSTALL_REQUIRES=1