Permalink
Browse files

Merge branch 'master' of github.com:divio/django-appmedia

Conflicts:
	MANIFEST.in
  • Loading branch information...
stefanfoulis committed Apr 11, 2010
2 parents b6df82d + f6d7ea8 commit 112ae8760e9561d1d1a2d90db1156cb1c93002d2
Showing with 2 additions and 39 deletions.
  1. +0 −18 .project
  2. +0 −10 .pydevproject
  3. +0 −1 MANIFEST.in
  4. +2 −5 appmedia/__init__.py
  5. +0 −5 setup.py
View
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>django-appmedia</name>
- <comment></comment>
- <projects>
- <project>django</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
View
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/django-appmedia</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>
View
@@ -1,2 +1 @@
include README.md
-
View
@@ -1,5 +1,2 @@
-VERSION = (1, 0, 0, 'final')
-if VERSION[-1] != "final":
- __version__ = '.'.join(map(str, VERSION))
-else:
- __version__ = '.'.join(map(str, VERSION[:-1]))
+VERSION = (1, 0, 1)
+__version__ = '1.0.1'
View
@@ -1,10 +1,6 @@
from setuptools import setup, find_packages
import os
import appmedia
-media_files = []
-
-for dirpath, dirnames, filenames in os.walk('cms/media'):
- media_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
setup(
author="Patrick Lauber",
@@ -34,6 +30,5 @@
package_dir={
'appmedia': 'appmedia',
},
- data_files = media_files,
zip_safe = False
)

0 comments on commit 112ae87

Please sign in to comment.