Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

Macieski
2 parents 935074f0 9d282a29
Showing 2 changed files with 13 additions and 5 deletions Show diff stats
development.ini
setup.py
@@ -47,4 +47,8 @@ formatter = generic
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
  
 [lbgenerator]
+<<<<<<< HEAD
+rest_url = http://localhost/api
+=======
 rest_url = http://api.brlight.net/api
+>>>>>>> 6e76090d48771cfb01a28e464240e812fe7abe23
@@ -7,17 +7,21 @@ README = open(os.path.join(here, &#39;README.md&#39;)).read()
 CHANGES = open(os.path.join(here, 'CHANGES.md')).read()
  
 requires = [
-    'pyramid',
     'SQLAlchemy',
+    'psycopg2',
     'transaction',
     'pyramid_tm',
     'pyramid_debugtoolbar',
     'zope.sqlalchemy',
-    'waitress',
-    'requests',
     'pyramid_chameleon',
-    'liblightbase'
-    ]
+    'bcrypt',
+    # 'lbauth',
+    'pyramid',
+    'pyramid_restler',
+    'pyramid_who',
+    'requests',
+    'waitress'
+]
  
 setup(name='WSCacicNeo',
       version='0.1',
...	...	@@ -47,4 +47,8 @@ formatter = generic
47	47	format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
48	48
49	49	[lbgenerator]
	50	+<<<<<<< HEAD
	51	+rest_url = http://localhost/api
	52	+=======
50	53	rest_url = http://api.brlight.net/api
	54	+>>>>>>> 6e76090d48771cfb01a28e464240e812fe7abe23
...	...
...	...	@@ -7,17 +7,21 @@ README = open(os.path.join(here, 'README.md')).read()
7	7	CHANGES = open(os.path.join(here, 'CHANGES.md')).read()
8	8
9	9	requires = [
10		- 'pyramid',
11	10	'SQLAlchemy',
	11	+ 'psycopg2',
12	12	'transaction',
13	13	'pyramid_tm',
14	14	'pyramid_debugtoolbar',
15	15	'zope.sqlalchemy',
16		- 'waitress',
17		- 'requests',
18	16	'pyramid_chameleon',
19		- 'liblightbase'
20		- ]
	17	+ 'bcrypt',
	18	+ # 'lbauth',
	19	+ 'pyramid',
	20	+ 'pyramid_restler',
	21	+ 'pyramid_who',
	22	+ 'requests',
	23	+ 'waitress'
	24	+]
21	25
22	26	setup(name='WSCacicNeo',
23	27	version='0.1',
...	...