Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

working out issues with setup.py

  • Loading branch information...
commit 5c10298e508e464dc032cb1d7be236021958f732 1 parent 40e5cdf
Andrew Schoen authored
View
5 .gitignore
@@ -5,4 +5,7 @@
*.html~
*.txt~
.DS_Store
-pip-log.txt
+pip-log.txt
+build
+dist
+*.egg-info
View
4 MANIFEST.in
@@ -0,0 +1,4 @@
+include AUTHORS
+include LICENSE
+include README.rst
+recursive-include multimedia/templates *
View
25 multimedia/conf/multimedia_settings.py
@@ -1,16 +1,15 @@
from django.conf import settings
+MEDIA_SERVER_HOST = getattr(settings, "MEDIA_SERVER_HOST", "")
+MEDIA_SERVER_USER = getattr(settings, "MEDIA_SERVER_USER", "")
+MEDIA_SERVER_PASSWORD = getattr(settings, "MEDIA_SERVER_PASSWORD", "")
+MEDIA_SERVER_PORT = getattr(settings, "MEDIA_SERVER_PORT", 22)
+MEDIA_SERVER_VIDEO_BUCKET = getattr(settings, "MEDIA_SERVER_VIDEO_BUCKET", "")
+MEDIA_SERVER_AUDIO_BUCKET = getattr(settings, "MEDIA_SERVER_AUDIO_BUCKET", "")
+MEDIA_SERVER_AUDIO_PATH = getattr(settings, "MEDIA_SERVER_AUDIO_PATH", "")
+MEDIA_SERVER_VIDEO_PATH = getattr(settings, "MEDIA_SERVER_VIDEO_PATH", "")
-MEDIA_SERVER_HOST = getattr(settings.MEDIA_SERVER_HOST, "")
-MEDIA_SERVER_USER = getattr(settings.MEDIA_SERVER_USER, "")
-MEDIA_SERVER_PASSWORD = getattr(settings.MEDIA_SERVER_PASSWORD, "")
-MEDIA_SERVER_PORT = getattr(settings.MEDIA_SERVER_PORT, 22)
-MEDIA_SERVER_VIDEO_BUCKET = getattr(settings.MEDIA_SERVER_VIDEO_BUCKET, "")
-MEDIA_SERVER_AUDIO_BUCKET = getattr(settings.MEDIA_SERVER_AUDIO_BUCKET, "")
-MEDIA_SERVER_AUDIO_PATH = getattr(settings.MEDIA_SERVER_AUDIO_PATH, "")
-MEDIA_SERVER_VIDEO_PATH = getattr(settings.MEDIA_SERVER_VIDEO_PATH, "")
-
-MULTIMEDIA_NOTIFICATION_EMAIL = getattr(settings.MULTIMEDIA_NOTIFICATION_EMAIL, "")
+MULTIMEDIA_NOTIFICATION_EMAIL = getattr(settings, "MULTIMEDIA_NOTIFICATION_EMAIL", "")
DEFAULT_VIDEO_PROFILES = {
'f4v': {
@@ -22,7 +21,7 @@
},
}
-MULTIMEDIA_VIDEO_PROFILES = getattr(settings.MULTIMEDIA_VIDEO_PROFILES, DEFAULT_VIDEO_PROFILES)
+MULTIMEDIA_VIDEO_PROFILES = getattr(settings, "MULTIMEDIA_VIDEO_PROFILES", DEFAULT_VIDEO_PROFILES)
DEFAULT_AUDIO_PROFILES = {
'audio': {
@@ -33,6 +32,6 @@
},
}
-MULTIMEDIA_AUDIO_PROFILES = getattr(settings.MULTIMEDIA_AUDIO_PROFILES, DEFAULT_AUDIO_PROFILES)
+MULTIMEDIA_AUDIO_PROFILES = getattr(settings, "MULTIMEDIA_AUDIO_PROFILES", DEFAULT_AUDIO_PROFILES)
-MULTIMEDIA_APP_LABLEL = getattr(settings.MULTIMEDIA_APP_LABEL, "Multimedia")
+MULTIMEDIA_APP_LABLEL = getattr(settings, "MULTIMEDIA_APP_LABEL", "Multimedia")
View
9 setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
import os
version = __import__('multimedia').__version__
@@ -20,7 +20,7 @@
description = "",
author = "Andrew Schoen",
author_email = 'andrew.schoen@gmail.com',
- packages=['multimedia'],
+ packages=find_packages(),
install_requires = install_requires,
include_package_data=True,
zip_safe=False,
@@ -36,5 +36,8 @@
'Topic :: Multimedia :: Video',
'Topic :: Multimedia :: Sound/Audio',
'Topic :: Multimedia :: Video :: Conversion',
- ]
+ ],
+ package_dir={
+ 'multimedia': 'multimedia',
+ },
)

0 comments on commit 5c10298

Please sign in to comment.
Something went wrong with that request. Please try again.