Add static files and templates to MANIFEST.in

This commit is contained in:
Frank Hamand 2017-02-16 18:36:30 +00:00
parent 764a93e4ca
commit df3e799cbc
5 changed files with 13 additions and 12 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ dev.db
venv/* venv/*
backups/* backups/*
static/ static/
cabot/.collectstatic/
node_modules/* node_modules/*
.python-eggs/* .python-eggs/*
cabot.egg-info cabot.egg-info

2
MANIFEST.in Normal file
View File

@ -0,0 +1,2 @@
recursive-include cabot/.collectstatic *
recursive-include cabot/templates *

View File

@ -69,7 +69,7 @@ MEDIA_URL = '%s/media/' % URL_PREFIX
# Don't put anything in this directory yourself; store your static files # Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS. # in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/" # Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = os.path.join(PROJECT_ROOT, os.path.pardir, 'static/') STATIC_ROOT = os.path.join(PROJECT_ROOT, '.collectstatic/')
COMPRESS_ROOT = STATIC_ROOT COMPRESS_ROOT = STATIC_ROOT

View File

@ -18,7 +18,6 @@
<link rel="stylesheet" href="{% static 'arachnys/css/graph.css' %}" type="text/css"> <link rel="stylesheet" href="{% static 'arachnys/css/graph.css' %}" type="text/css">
{% endcompress %} {% endcompress %}
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="icon" href="{% static 'arachnys/img/icon_48x48.png'%}" type="image/png"> <link rel="icon" href="{% static 'arachnys/img/icon_48x48.png'%}" type="image/png">
{% compress js %} {% compress js %}
<script type="text/coffeescript"> <script type="text/coffeescript">

View File

@ -2,19 +2,18 @@
import os import os
from setuptools import setup, find_packages from setuptools import setup, find_packages
from os import environ as env from os import environ as env
import subprocess
requirements_file = os.path.join(os.path.dirname(__file__), 'requirements.txt') from pip.req import parse_requirements
with open(requirements_file) as f:
requirements = [line.rstrip('\n')
for line in f
if line and not line.startswith('#')]
# pull in active plugins requirements = [str(req.req) for req in parse_requirements('requirements.txt', session=False)]
plugins = env['CABOT_PLUGINS_ENABLED'].split(',') if 'CABOT_PLUGINS_ENABLED' in env else ["cabot_alert_hipchat", "cabot_alert_twilio", "cabot_alert_email"] requirements_plugins = [str(req.req) for req in parse_requirements('requirements-plugins.txt', session=False)]
VERSION = subprocess.check_output(['git', 'describe', '--tags']).strip()
setup( setup(
name='cabot', name='cabot',
version='0.8.3', version=VERSION,
description="Self-hosted, easily-deployable monitoring and alerts service" description="Self-hosted, easily-deployable monitoring and alerts service"
" - like a lightweight PagerDuty", " - like a lightweight PagerDuty",
long_description=open('README.md').read(), long_description=open('README.md').read(),
@ -22,8 +21,8 @@ setup(
author_email='info@arachnys.com', author_email='info@arachnys.com',
url='http://cabotapp.com', url='http://cabotapp.com',
license='MIT', license='MIT',
install_requires=requirements + plugins, install_requires=requirements + requirements_plugins,
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False
) )