From b012b21c77d0a1c9938bdb5d3cc16f3da78247f8 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 28 Sep 2013 18:04:21 +0200 Subject: [PATCH 1/3] fix syntax in README.rst --- README.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index d8fc997..ed50435 100644 --- a/README.rst +++ b/README.rst @@ -10,20 +10,23 @@ 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 pip install -r requirements.d/dev. From 625edb90f3530f6a815b403620e15b96b9c999d2 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 28 Sep 2013 18:08:06 +0200 Subject: [PATCH 2/3] fix syntax in README.rst, now really --- README.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index ed50435..1566d19 100644 --- a/README.rst +++ b/README.rst @@ -10,23 +10,20 @@ 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 pip install -r requirements.d/dev. From 9c41b1eb243c4bcbf9185af506c1ac832f2d11a4 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 28 Sep 2013 18:49:09 +0200 Subject: [PATCH 3/3] misc. setup.* related changes / enhancements --- .gitignore | 2 ++ MANIFEST.in | 10 +++++++++- pytest.ini | 3 --- setup.cfg | 33 +++++++++++++++++++++++++++++++++ setup.py | 15 ++++++++++++--- 5 files changed, 56 insertions(+), 7 deletions(-) delete mode 100644 pytest.ini create mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index fb216ea..4ad5396 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ local_settings.py .cache/ *.sqlite *.egg-info +dist/ + diff --git a/MANIFEST.in b/MANIFEST.in index ad081fc..4b55562 100644 --- a/MANIFEST.in +++ b/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 + diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 43ce42e..0000000 --- a/pytest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[pytest] -DJANGO_SETTINGS_MODULE = nsupdate.nsupdate.settings - diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..163ca79 --- /dev/null +++ b/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 + diff --git a/setup.py b/setup.py index 8ac213e..92add87 100644 --- a/setup.py +++ b/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',