Organizing pip setup

victorette · Jun 20, 2014 · 283d4e6 · 283d4e6
1 parent 97dbbac
commit 283d4e6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 284 deletions.
diff --git a/README.md b/README.md
@@ -203,4 +203,7 @@ At this point you should have modified those files **settings.py** and **urls.py
 
 ### Add a new ExtJS app
 
-### Customizing models
+### Customizing models
+
+### Production
+Copy ...Python/2.7/lib/python/site-packages/protobase/static to your local static folder...
diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 import os
 from setuptools import setup
 from setuptools import find_packages
@@ -12,7 +11,7 @@
 setup(
     name='django-softmachine',
     version='1.0.2',
-    packages=find_packages('src',exclude=['tests','alltests', 'softmachine']),
+    packages=find_packages('src',exclude=['alltests', 'softmachine', 'alltests.*']),
     package_dir = {'':'src'},
     include_package_data=True,
     license='GPL License, see docs/LICENCE.md',

diff --git a/src/snippets/css/print.css b/src/snippets/css/print.css
diff --git a/src/snippets/css/printDGT.css b/src/snippets/css/printDGT.css
diff --git a/src/snippets/css/protoOrg.css b/src/snippets/css/protoOrg.css
diff --git a/src/softmachine/settings.py b/src/softmachine/settings.py
@@ -13,7 +13,6 @@
 TEMPLATE_DEBUG = DEBUG
 
 EXTJS_VERSION = '4.2.1'
-EXTJS_URL = 'http://cdn.sencha.com/ext/gpl/'
 
 ADMINS = (
      ('Dario Gomez', 'dariogomezt@gmail.com'),
@@ -91,9 +90,9 @@
 )
 
 if PPATH.startswith('/'):
-    EXT_PATH = '/opt/data/ExtJs'
+    EXT_PATH = '/opt/data/ext-%(extjsversion)s' % {"extjsversion" : EXTJS_VERSION}
 else:
-    EXT_PATH = 'd:/data/ExtJs'
+    EXT_PATH = 'd:/data/ExtJs/'
 
 STATICFILES_DIRS = (
     PPATH + '/static',

diff --git a/src/softmachine/settings_development.py b/src/softmachine/settings_development.py
@@ -30,6 +30,7 @@
     'django.contrib.auth',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'protobase',
     'protoLib',
     'prototype',
     'alltests',