Merge branch 'master' of github.com:asmaps/nsupdate.info

.gitignore

@@ -6,3 +6,5 @@ local_settings.py
 .cache/
 *.sqlite
 *.egg-info
+dist/
+

MANIFEST.in

@@ -1,5 +1,13 @@
-include README.md LICENSE AUTHORS
+include README.rst LICENSE AUTHORS
+include setup.cfg setup.py
 recursive-include docs *
 recursive-exclude docs *.pyc
 recursive-exclude docs *.pyo
+recursive-include nsupdate/nsupdate/static *
+recursive-include nsupdate/nsupdate/templates *
+recursive-include nsupdate/main/static *
+recursive-include nsupdate/main/templates *
+recursive-include nsupdate/accounts/static *
+recursive-include nsupdate/accounts/templates *
 prune docs/_build
+

README.rst

@@ -10,19 +10,19 @@ Installation
 ============
 
 If you haven't already done create and change to a virtualenv for the
-installation (here with virtualenvwrapper)
+installation (here with virtualenvwrapper)::
 
     mkvirtualenv nsupdate
     workon nsupdate
 
 
-Clone the repo and cd into
+Clone the repo and cd into::
 
     git clone git@github.com:asmaps/nsupdate.info.git nsupdate
     cd nsupdate
 
 
-Then install the requirements (either "dev" or just "all" for production)
+Then install the requirements (either "dev" or just "all" for production)::
 
     pip install -r requirements.d/all.txt
     # or for dev

pytest.ini

@@ -1,3 +0,0 @@
-[pytest]
-DJANGO_SETTINGS_MODULE = nsupdate.nsupdate.settings
-

setup.cfg

@@ -0,0 +1,33 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
+[bdist_rpm]
+release=1
+doc_files=
+    README.rst
+    LICENSE
+    PKG-INFO
+    docs/
+requires=python
+build_requires=python
+
+[build_sphinx]
+source-dir = docs/
+build-dir = docs/_build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = docs/_build/html
+
+[pytest]
+DJANGO_SETTINGS_MODULE = nsupdate.nsupdate.settings
+pep8maxlinelength = 120
+norecursedirs = .git
+minversion = 2.3
+pep8ignore =
+ *.py E124  # closing bracket does not match visual indentation (behaves strange!?)
+ *.py E125  # continuation line does not distinguish itself from next logical line (difficult to avoid!)
+ docs/conf.py ALL  # sphinx stuff, automatically generated, don't check this
+

setup.py

@@ -1,6 +1,6 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
-with open('README.md') as f:
+with open('README.rst') as f:
     readme_content = f.read()
 
 setup(
@@ -12,7 +12,16 @@ setup(
     author_email='info@nsupdate.info',
     description='A dynamic DNS update service',
     long_description=readme_content,
-    packages=['nsupdate'],
+    keywords="dyndns ddns dynamic dns django",
+    packages=find_packages(exclude=['_tests', ]),
+    package_data={
+        'nsupdate.nsupdate.static': ['*', ],
+        'nsupdate.nsupdate.templates': ['*', ],
+        'nsupdate.main.static': ['*', ],
+        'nsupdate.main.templates': ['*', ],
+        'nsupdate.accounts.static': ['*', ],
+        'nsupdate.accounts.templates': ['*', ],
+    },
     include_package_data=True,
     zip_safe=False,
     platforms='any',