Permalink
Browse files

deployment fixes:

version, authors, license, fixed minor issue with requirements, settings, added setup
moved net manager to its own app codebase
  • Loading branch information...
1 parent a57bdcf commit 2b5c58a2b52945b770163568776508c18a8a3b9a nemesisdesign committed Sep 6, 2013
View
23 AUTHORS
@@ -0,0 +1,23 @@
+ _ _ _
+ _ __ ___ __| | ___ ___| |__ ___ | |_
+| '_ \ / _ \ / _` |/ _ \/ __| '_ \ / _ \| __|
+| | | | (_) | (_| | __/\__ \ | | | (_) | |_
+|_| |_|\___/ \__,_|\___||___/_| |_|\___/ \__|
+
+
+Current mantainers
+-----------------
+Federico Capoano https://nemesisdesign.net
+
+
+Original author
+---------------
+Lorenzo Bracciale https://github.com/OrazioPirataDelloSpazio
+
+
+Contributors
+------------
+Stefano Tonazzi https://github.com/stonaz/
+Claudio Pisa https://github.com/cl4u2
+Saverio Proto https://github.com/zioproto
+Angelo Giovinazzo https://github.com/sephiroth6
View
2 LICENSE
@@ -6,7 +6,7 @@
A nice snapshot of your wireless community network
-Copyright (C) 2012 Ninux.org
+Copyright (C) 2013 Ninux.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
View
9 README
@@ -1,9 +0,0 @@
- _ _ _
- _ __ ___ __| | ___ ___| |__ ___ | |_
-| '_ \ / _ \ / _` |/ _ \/ __| '_ \ / _ \| __|
-| | | | (_) | (_| | __/\__ \ | | | (_) | |_
-|_| |_|\___/ \__,_|\___||___/_| |_|\___/ \__|
-
-
-TODO
-Write new README
View
16 nodeshot/__init__.py
@@ -1,2 +1,14 @@
-VERSION = (2, 0, 0, 'alpha')
-__version__ = VERSION
+VERSION = (1, 0, 0, 'alpha')
+__version__ = VERSION
+
+
+def get_version():
+ version = '%s.%s' % (VERSION[0], VERSION[1])
+ if VERSION[2]:
+ version = '%s.%s' % (version, VERSION[2])
+ if VERSION[3:] == ('alpha', 0):
+ version = '%s pre-alpha' % version
+ else:
+ if VERSION[3] != 'final':
+ version = '%s %s' % (version, VERSION[3])
+ return version
View
10 nodeshot/core/base/managers.py
@@ -1,7 +1,5 @@
import sys
-from netfields.managers import NetQuery, NetWhere, NetManager
-
if not 'synchronize' in sys.argv and not 'celery' in sys.argv:
from django.contrib.auth import get_user_model
User = get_user_model()
@@ -187,14 +185,6 @@ def get_query_set(self):
return AccessLevelQuerySet(self.model, using=self._db)
-class NetAccessLevelManager(NetManager, ExtendedManagerMixin, ACLMixin):
- """ NetManager + AccessLevelManager """
-
- def get_query_set(self):
- q = NetQuery(self.model, NetWhere)
- return AccessLevelQuerySet(self.model, using=self._db, query=q)
-
-
class AccessLevelPublishedManager(Manager, ExtendedManagerMixin, ACLMixin, PublishedMixin):
"""
AccessLeveManager and Publishedmanager in one
View
10 nodeshot/networking/net/managers.py
@@ -0,0 +1,10 @@
+from netfields.managers import NetQuery, NetWhere, NetManager
+from nodeshot.core.base.managers import ExtendedManagerMixin, ACLMixin, AccessLevelQuerySet
+
+
+class NetAccessLevelManager(NetManager, ExtendedManagerMixin, ACLMixin):
+ """ NetManager + AccessLevelManager """
+
+ def get_query_set(self):
+ q = NetQuery(self.model, NetWhere)
+ return AccessLevelQuerySet(self.model, using=self._db, query=q)
View
3 nodeshot/networking/net/models/ip.py
@@ -7,10 +7,11 @@
from django.conf import settings
from nodeshot.core.base.models import BaseAccessLevel
-from nodeshot.core.base.managers import NetAccessLevelManager
+from ..managers import NetAccessLevelManager
from choices import IP_PROTOCOLS
+
class Ip(BaseAccessLevel):
""" IP Address Model """
interface = models.ForeignKey('net.Interface', verbose_name=_('interface'))
View
3 projects/ninux/ninux/settings.example.py
@@ -61,7 +61,6 @@
# If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = True
-SITE_NAME = 'Ninux.org'
SITE_DOMAIN = 'localhost'
PROTOCOL = 'http'
BASE_URL = 'http://%s/' % SITE_DOMAIN
@@ -209,7 +208,7 @@
'social_auth',
# other utilities
- 'django-extensions',
+ 'django_extensions',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
View
2 requirements.txt
@@ -25,7 +25,7 @@ django-filebrowser==3.5.2
django-extensions
# geodjango improved widgets
-olwidget
+django-olwidget
# RESTful API and API documentation
djangorestframework==2.3.7
View
35 setup.py
@@ -0,0 +1,35 @@
+from setuptools import setup, find_packages
+from setuptools.command.test import test
+
+from .nodeshot import get_version
+
+
+#class TestCommand(test):
+# def run(self):
+# from tests.runtests import runtests
+# runtests()
+
+
+setup(
+ name='nodeshot',
+ version=get_version(),
+ description="Extensible Django web application for management of community-led georeferenced data.",
+ long_description=open('README.md').read(),
+ author='Federico Capoano',
+ author_email='federico[at]nemesisdesign[dot]net',
+ license='GPL3',
+ url='https://github.com/nemesisdesign/nodeshot',
+ packages=find_packages(exclude=['docs', 'docs.*']),
+ zip_safe=False,
+ classifiers=[
+ 'Development Status :: 3 - Alpha',
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: GPL3 License',
+ 'Operating System :: Linux/Unix',
+ 'Programming Language :: Python',
+ 'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+ 'Framework :: Django',
+ ],
+ #cmdclass={"test": TestCommand},
+)

0 comments on commit 2b5c58a

Please sign in to comment.