Setup Wikked Pypi package:
- Moved all assets into `wikked/assets` for proper packaging.
- Added `setuptools` stuff.
5 files changed, 106 insertions(+), 26 deletions(-)

M .hgignore
M Gruntfile.js
A => MANIFEST.in
A => setup.py
M wikked/web.py
M .hgignore +4 -0
@@ 1,8 1,12 @@ 
 syntax:glob
 venv
 node_modules
+wikked/static
+dist
 build
 *.pyc
 *.pyo
 *.sublime-*
+MANIFEST
+Wikked.egg-info
 

          
M Gruntfile.js +28 -25
@@ 6,19 6,19 @@ module.exports = function(grunt) {
     less: {
       development: {
         options: {
-          paths: ["static"]
+          paths: ["wikked/assets"]
         },
         files: {
-          "build/css/wikked.min.css": "static/css/wikked.less"
+          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less"
         }
       },
       production: {
         options: {
-          paths: ["static"],
+          paths: ["wikked/assets"],
           compress: true
         },
         files: {
-          "build/css/wikked.min.css": "static/css/wikked.less"
+          "wikked/static/css/wikked.min.css": "wikked/assets/css/wikked.less"
         }
       }
     },

          
@@ 26,70 26,73 @@ module.exports = function(grunt) {
       development: {
         options: {
           optimize: "none",
-          baseUrl: "static",
-          mainConfigFile: "static/js/wikked.js",
+          baseUrl: "wikked/assets",
+          mainConfigFile: "wikked/assets/js/wikked.js",
           name: "js/wikked",
-          out: "build/js/wikked.min.js"
+          out: "wikked/static/js/wikked.min.js"
         }
       },
       production: {
         options: {
           optimize: "uglify",
-          baseUrl: "static",
-          mainConfigFile: "static/js/wikked.js",
+          baseUrl: "wikked/assets",
+          mainConfigFile: "wikked/assets/js/wikked.js",
           name: "js/wikked",
-          out: "build/js/wikked.min.js"
+          out: "wikked/static/js/wikked.min.js"
         }
       }
     },
     imagemin: {
       all: {
-        files: [
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['img/*.{png,jpg,gif}']}
-        ]
+        files: [{
+              expand: true,
+              cwd: 'wikked/assets/',
+              dest: 'wikked/static/',
+              src: ['img/*.{png,jpg,gif}']
+        }]
       }
     },
     copy: {
       development: {
         files: [
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['img/**']},
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['js/**']},
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['tpl/**']},
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['bootstrap/js/*.js']}
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['img/**']},
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['js/**']},
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['tpl/**']},
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['bootstrap/js/*.js']}
         ]
       },
       dev_scripts: {
         files: [
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['js/wikked.js', 'js/wikked/**']}
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['js/wikked.js', 'js/wikked/**']}
         ]
       },
       dev_templates: {
         files: [
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['tpl/**']}
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['tpl/**']}
         ]
       },
       production: {
         files: [
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['js/require.js']},
-          {expand: true, cwd: 'static/', dest: 'build/', src: ['font-awesome/font/**']}
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['js/require.js']},
+          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['font-awesome/font/**']}
         ]
       }
     },
     jshint: {
-      all: ['static/js/wikked.js', 'static/js/wikked/**/*.js'],
+      all: ['wikked/assets/js/wikked.js', 'wikked/assets/js/wikked/**/*.js'],
       gruntfile: ['Gruntfile.js']
     },
     watch: {
       scripts: {
-        files: ['static/js/wikked.js', 'static/js/wikked/**'],
+        files: ['wikked/assets/js/wikked.js', 'wikked/assets/js/wikked/**'],
         tasks: ['jshint:all', 'copy:dev_scripts']
       },
       templates: {
-        files: ['static/tpl/**/*.html'],
+        files: ['wikked/assets/tpl/**/*.html'],
         tasks: ['copy:dev_templates']
       },
       styles: {
-        files: ['static/css/**/*.less'],
+        files: ['wikked/assets/css/**/*.less'],
         tasks: ['less:development']
       },
       gruntfile: {

          
A => MANIFEST.in +5 -0
@@ 0,0 1,5 @@ 
+include wikked/static/css/wikked.min.css
+include wikked/static/img/*.png
+include wikked/static/js/require.js
+include wikked/static/js/wikked.min.js
+

          
A => setup.py +68 -0
@@ 0,0 1,68 @@ 
+import os
+import os.path
+from setuptools import setup, find_packages
+
+
+def read(fname):
+    with open(os.path.join(os.path.dirname(__file__), fname)) as fp:
+        return fp.read()
+
+
+setup(
+        name='Wikked',
+        version='0.1.0.0',
+        description=("A wiki engine entirely managed with text files "
+            "stored in a revision control system."),
+        author='Ludovic Chabant',
+        author_email='ludovic@chabant.com',
+        url="http://bolt80.com/wikked/",
+        license="Apache 2.0",
+        keywords="wiki mercurial hg git",
+        packages=find_packages(exclude=["tests"]),
+        install_requires=[
+            'Flask>=0.10',
+            'Flask-Login>=0.1.3',
+            'Flask-SQLAlchemy>=1.0',
+            'Flask-Script>=0.5.1',
+            'Jinja2>=2.6',
+            'Markdown>=2.2.1',
+            'PyYAML>=3.10',
+            'Pygments>=1.5',
+            'SQLAlchemy>=0.8.3',
+            'Werkzeug>=0.8.3',
+            'Whoosh>=2.4.1',
+            'argparse>=1.2.1',
+            'pybars>=0.0.4',
+            'python-hglib>=1.0',
+            'twill>=0.9',
+            'wsgiref>=0.1.2'
+            ],
+        scripts=['wk.py'],
+        include_package_data=True,
+        package_data={
+            'wikked': [
+                'templates/*.html',
+                'static/css/wikked.min.css',
+                'static/img/*.png',
+                'static/js/require.js',
+                'static/js/wikked.min.js'
+                ]
+            },
+        zip_safe=False,
+        classifiers=[
+                'Development Status :: 3 - Alpha',
+                'License :: OSI Approved :: Apache Software License',
+                'Environment :: Console',
+                'Operating System :: MacOS :: MacOS X',
+                'Operating System :: Unix',
+                'Operating System :: POSIX',
+                'Operating System :: Microsoft :: Windows',
+                'Programming Language :: Python',
+            ],
+        entry_points={
+                'console_scripts': [
+                    'wk = wk:main'
+                ]
+            },
+        )
+

          
M wikked/web.py +1 -1
@@ 5,7 5,7 @@ from flask import Flask, abort, g
 from utils import find_wiki_root
 
 # Create the main app.
-static_folder = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'build')
+static_folder = os.path.join(os.path.dirname(__file__), 'static')
 app = Flask(
         'wikked',
         static_folder=static_folder,