[Python-modules-commits] [python-django-treebeard] 01/11: Import python-django-treebeard_4.1.0+dfsg.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Tue Nov 29 09:31:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-treebeard.
commit bfd674a5ef5a3d303367da7a20850304a26e06ea
Author: Michael Fladischer <fladi at debian.org>
Date: Mon Nov 28 13:04:13 2016 +0100
Import python-django-treebeard_4.1.0+dfsg.orig.tar.gz
---
CHANGES | 10 +
MANIFEST.in | 6 +-
PKG-INFO | 31 ++-
README.rst | 25 +-
django_treebeard.egg-info/PKG-INFO | 31 ++-
django_treebeard.egg-info/SOURCES.txt | 43 ++-
docs/Makefile | 136 +++++++--
docs/changes.rst | 4 -
docs/conf.py | 59 ----
docs/{ => source}/admin.rst | 0
docs/{ => source}/al_tree.rst | 0
docs/{ => source}/api.rst | 0
docs/{ => source}/caveats.rst | 0
docs/source/changes.rst | 4 +
docs/source/conf.py | 303 +++++++++++++++++++++
docs/{ => source}/exceptions.rst | 0
docs/{ => source}/forms.rst | 0
docs/{ => source}/index.rst | 0
docs/{ => source}/install.rst | 0
docs/{ => source}/mp_tree.rst | 0
docs/{ => source}/ns_tree.rst | 0
docs/{ => source}/tests.rst | 9 +-
docs/{ => source}/tutorial.rst | 0
setup.py | 40 +--
treebeard/__init__.py | 21 +-
treebeard/admin.py | 29 +-
treebeard/forms.py | 4 +-
treebeard/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 732 bytes
treebeard/locale/es/LC_MESSAGES/django.po | 78 ++++++
treebeard/locale/es/LC_MESSAGES/djangojs.mo | Bin 0 -> 374 bytes
treebeard/locale/es/LC_MESSAGES/djangojs.po | 24 ++
treebeard/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 1512 bytes
treebeard/locale/nl/LC_MESSAGES/django.po | 80 ++++++
treebeard/locale/nl/LC_MESSAGES/djangojs.mo | Bin 0 -> 532 bytes
treebeard/locale/nl/LC_MESSAGES/djangojs.po | 24 ++
treebeard/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 783 bytes
treebeard/locale/pl/LC_MESSAGES/django.po | 44 +++
treebeard/locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 874 bytes
treebeard/locale/ru/LC_MESSAGES/django.po | 79 ++++++
treebeard/locale/ru/LC_MESSAGES/djangojs.mo | Bin 0 -> 445 bytes
treebeard/locale/ru/LC_MESSAGES/djangojs.po | 25 ++
treebeard/mp_tree.py | 15 +-
.../templates/admin/tree_change_list_results.html | 1 -
treebeard/tests/conftest.py | 60 +---
treebeard/tests/settings.py | 112 ++++----
treebeard/tests/urls.py | 8 +-
46 files changed, 1026 insertions(+), 279 deletions(-)
diff --git a/CHANGES b/CHANGES
index f6b1409..fa29e61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+Release 4.1.0 (Nov 24, 2016)
+---------------------------
+
+* Add support for Django-1.10
+* Drop support for Django-1.7
+* Moved Repository from Bitbucket to GitHub
+* Moved documentation to https://django-treebeard.readthedocs.io/
+* Moved continuous integration to https://travis-ci.org/django-treebeard/django-treebeard
+
+
Release 4.0.1 (May 1, 2016)
---------------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index fd87d7a..99ca10d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,5 @@
include CHANGES LICENSE NOTICE README.rst UPDATING MANIFEST.in
-recursive-include docs Makefile README.rst *.py *.rst
-recursive-include treebeard *.py *.html *.js *.css *.png
+recursive-include treebeard *.py
+recursive-include treebeard/static *
+recursive-include treebeard/templates *
+recursive-include treebeard/locale *
diff --git a/PKG-INFO b/PKG-INFO
index 76d5194..d165513 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,18 +1,19 @@
Metadata-Version: 1.1
Name: django-treebeard
-Version: 4.0.1
-Summary: Efficient tree implementations for Django 1.7+
-Home-page: https://tabo.pe/projects/django-treebeard/
+Version: 4.1.0
+Summary: Efficient tree implementations for Django
+Home-page: https://github.com/django-treebeard/django-treebeard/
Author: Gustavo Picon
Author-email: tabo at tabo.pe
License: Apache License 2.0
-Description:
+Description: ================
django-treebeard
================
- django-treebeard is a library that implements efficient tree implementations
- for the Django Web Framework 1.6+, written by Gustavo Picón and licensed under
- the Apache License 2.0.
+ **django-treebeard** is a library that implements efficient tree implementations
+ for the Django Web Framework 1.7 and later.
+
+ It is written by Gustavo Picón and licensed under the Apache License 2.0.
django-treebeard is:
@@ -28,13 +29,21 @@ Description:
- **Clean**: Testable and well tested code base. Code/branch test coverage is above
96%. Tests are available in Jenkins:
- - Test suite running on different versions of Python, Django and database
- engine: https://tabo.pe/jenkins/job/django-treebeard/
- - Code quality: https://tabo.pe/jenkins/job/django-treebeard-quality/
+ - Test suite running on different versions of Python and Django:
+ https://travis-ci.org/django-treebeard/django-treebeard/
You can find the documentation in
- https://tabo.pe/projects/django-treebeard/docs/tip/
+ http://django-treebeard.readthedocs.io/en/latest/
+
+ Supported versions
+ ==================
+
+ **django-treebeard** officially supports
+
+ * Django 1.8 - 1.10
+ * Python 2.7, 3.4, 3.5
+ * PostgreSQL, MySQL, SQLite database back-ends.
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/README.rst b/README.rst
index 5a1deef..0294d14 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,11 @@
-
+================
django-treebeard
================
-django-treebeard is a library that implements efficient tree implementations
-for the Django Web Framework 1.6+, written by Gustavo Picón and licensed under
-the Apache License 2.0.
+**django-treebeard** is a library that implements efficient tree implementations
+for the Django Web Framework 1.7 and later.
+
+It is written by Gustavo Picón and licensed under the Apache License 2.0.
django-treebeard is:
@@ -20,10 +21,18 @@ django-treebeard is:
- **Clean**: Testable and well tested code base. Code/branch test coverage is above
96%. Tests are available in Jenkins:
- - Test suite running on different versions of Python, Django and database
- engine: https://tabo.pe/jenkins/job/django-treebeard/
- - Code quality: https://tabo.pe/jenkins/job/django-treebeard-quality/
+ - Test suite running on different versions of Python and Django:
+ https://travis-ci.org/django-treebeard/django-treebeard/
You can find the documentation in
- https://tabo.pe/projects/django-treebeard/docs/tip/
+ http://django-treebeard.readthedocs.io/en/latest/
+
+Supported versions
+==================
+
+**django-treebeard** officially supports
+
+* Django 1.8 - 1.10
+* Python 2.7, 3.4, 3.5
+* PostgreSQL, MySQL, SQLite database back-ends.
diff --git a/django_treebeard.egg-info/PKG-INFO b/django_treebeard.egg-info/PKG-INFO
index 76d5194..d165513 100644
--- a/django_treebeard.egg-info/PKG-INFO
+++ b/django_treebeard.egg-info/PKG-INFO
@@ -1,18 +1,19 @@
Metadata-Version: 1.1
Name: django-treebeard
-Version: 4.0.1
-Summary: Efficient tree implementations for Django 1.7+
-Home-page: https://tabo.pe/projects/django-treebeard/
+Version: 4.1.0
+Summary: Efficient tree implementations for Django
+Home-page: https://github.com/django-treebeard/django-treebeard/
Author: Gustavo Picon
Author-email: tabo at tabo.pe
License: Apache License 2.0
-Description:
+Description: ================
django-treebeard
================
- django-treebeard is a library that implements efficient tree implementations
- for the Django Web Framework 1.6+, written by Gustavo Picón and licensed under
- the Apache License 2.0.
+ **django-treebeard** is a library that implements efficient tree implementations
+ for the Django Web Framework 1.7 and later.
+
+ It is written by Gustavo Picón and licensed under the Apache License 2.0.
django-treebeard is:
@@ -28,13 +29,21 @@ Description:
- **Clean**: Testable and well tested code base. Code/branch test coverage is above
96%. Tests are available in Jenkins:
- - Test suite running on different versions of Python, Django and database
- engine: https://tabo.pe/jenkins/job/django-treebeard/
- - Code quality: https://tabo.pe/jenkins/job/django-treebeard-quality/
+ - Test suite running on different versions of Python and Django:
+ https://travis-ci.org/django-treebeard/django-treebeard/
You can find the documentation in
- https://tabo.pe/projects/django-treebeard/docs/tip/
+ http://django-treebeard.readthedocs.io/en/latest/
+
+ Supported versions
+ ==================
+
+ **django-treebeard** officially supports
+
+ * Django 1.8 - 1.10
+ * Python 2.7, 3.4, 3.5
+ * PostgreSQL, MySQL, SQLite database back-ends.
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/django_treebeard.egg-info/SOURCES.txt b/django_treebeard.egg-info/SOURCES.txt
index 22e18c4..12b59f6 100644
--- a/django_treebeard.egg-info/SOURCES.txt
+++ b/django_treebeard.egg-info/SOURCES.txt
@@ -11,21 +11,20 @@ django_treebeard.egg-info/dependency_links.txt
django_treebeard.egg-info/requires.txt
django_treebeard.egg-info/top_level.txt
docs/Makefile
-docs/admin.rst
-docs/al_tree.rst
-docs/api.rst
-docs/caveats.rst
-docs/changes.rst
-docs/conf.py
-docs/exceptions.rst
-docs/forms.rst
-docs/index.rst
-docs/install.rst
-docs/mp_tree.rst
-docs/ns_tree.rst
-docs/tests.rst
-docs/tutorial.rst
-docs/_ext/djangodocs.py
+docs/source/admin.rst
+docs/source/al_tree.rst
+docs/source/api.rst
+docs/source/caveats.rst
+docs/source/changes.rst
+docs/source/conf.py
+docs/source/exceptions.rst
+docs/source/forms.rst
+docs/source/index.rst
+docs/source/install.rst
+docs/source/mp_tree.rst
+docs/source/ns_tree.rst
+docs/source/tests.rst
+docs/source/tutorial.rst
treebeard/__init__.py
treebeard/admin.py
treebeard/al_tree.py
@@ -35,6 +34,20 @@ treebeard/models.py
treebeard/mp_tree.py
treebeard/ns_tree.py
treebeard/numconv.py
+treebeard/locale/es/LC_MESSAGES/django.mo
+treebeard/locale/es/LC_MESSAGES/django.po
+treebeard/locale/es/LC_MESSAGES/djangojs.mo
+treebeard/locale/es/LC_MESSAGES/djangojs.po
+treebeard/locale/nl/LC_MESSAGES/django.mo
+treebeard/locale/nl/LC_MESSAGES/django.po
+treebeard/locale/nl/LC_MESSAGES/djangojs.mo
+treebeard/locale/nl/LC_MESSAGES/djangojs.po
+treebeard/locale/pl/LC_MESSAGES/django.mo
+treebeard/locale/pl/LC_MESSAGES/django.po
+treebeard/locale/ru/LC_MESSAGES/django.mo
+treebeard/locale/ru/LC_MESSAGES/django.po
+treebeard/locale/ru/LC_MESSAGES/djangojs.mo
+treebeard/locale/ru/LC_MESSAGES/djangojs.po
treebeard/static/treebeard/expand-collapse.png
treebeard/static/treebeard/jquery-ui-1.8.5.custom.min.js
treebeard/static/treebeard/treebeard-admin.css
diff --git a/docs/Makefile b/docs/Makefile
index f325fb3..abebb14 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,34 +5,53 @@
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
-BUILDDIR = _build
+BUILDDIR = build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
help:
@echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " dirhtml to make HTML files named index.html in directories"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @echo " htmlhelp to make HTML files and a HTML help project"
- @echo " qthelp to make HTML files and a qthelp project"
- @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
- @echo " changes to make an overview of all changed/added/deprecated items"
- @echo " linkcheck to check all external links for integrity"
- @echo " doctest to run all doctests embedded in the documentation (if enabled)"
- @echo " coverage Coverage"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " applehelp to make an Apple Help Book"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " xml to make Docutils-native XML files"
+ @echo " pseudoxml to make pseudoxml-XML files for display purposes"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+ @echo " coverage to run coverage check of the documentation (if enabled)"
clean:
- -rm -rf $(BUILDDIR)/*
+ rm -rf $(BUILDDIR)/*
html:
- mkdir -p _static
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
@@ -42,6 +61,11 @@ dirhtml:
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@@ -67,12 +91,74 @@ qthelp:
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/django-treebeard.qhc"
+applehelp:
+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+ @echo
+ @echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+ @echo "N.B. You won't be able to view it unless you put it in" \
+ "~/Library/Documentation/Help or install it in your application" \
+ "bundle."
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/django-treebeard"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/django-treebeard"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through platex and dvipdfmx..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@@ -92,5 +178,15 @@ doctest:
coverage:
$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
- @echo "Coverage, " \
- "results in $(BUILDDIR)/coverage"
+ @echo "Testing of coverage in the sources finished, look at the " \
+ "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+ @echo
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+ @echo
+ @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/changes.rst b/docs/changes.rst
deleted file mode 100644
index 3b6a0a9..0000000
--- a/docs/changes.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Changelog
-=========
-
-.. include:: ../CHANGES
diff --git a/docs/conf.py b/docs/conf.py
deleted file mode 100644
index 8b7e369..0000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-
-Configuration for the Sphinx documentation generator.
-
-Reference: http://sphinx.pocoo.org/config.html
-
-"""
-
-import os
-import sys
-
-
-def docs_dir():
- rd = os.path.dirname(__file__)
- if rd:
- return rd
- return '.'
-
-
-for directory in ('_ext', '..'):
- sys.path.insert(0, os.path.abspath(os.path.join(docs_dir(), directory)))
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'treebeard.tests.settings'
-
-extensions = [
- 'djangodocs',
- 'sphinx.ext.autodoc',
- 'sphinx.ext.coverage',
- 'sphinx.ext.graphviz',
- 'sphinx.ext.inheritance_diagram',
- 'sphinx.ext.todo',
- 'sphinx.ext.intersphinx',
-]
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = 'django-treebeard'
-copyright = '2008-2016, Gustavo Picon'
-version = '4.0.1'
-release = '4.0.1'
-exclude_trees = ['_build']
-pygments_style = 'sphinx'
-html_theme = 'default'
-html_static_path = ['_static']
-htmlhelp_basename = 'django-treebearddoc'
-latex_documents = [(
- 'index',
- 'django-treebeard.tex',
- 'django-treebeard Documentation',
- 'Gustavo Picon',
- 'manual')]
-intersphinx_mapping = {
- 'python': ('http://docs.python.org/3', None),
- 'django': (
- 'https://docs.djangoproject.com/en/1.7/',
- 'https://docs.djangoproject.com/en/1.7/_objects/'
- ),
-}
diff --git a/docs/admin.rst b/docs/source/admin.rst
similarity index 100%
rename from docs/admin.rst
rename to docs/source/admin.rst
diff --git a/docs/al_tree.rst b/docs/source/al_tree.rst
similarity index 100%
rename from docs/al_tree.rst
rename to docs/source/al_tree.rst
diff --git a/docs/api.rst b/docs/source/api.rst
similarity index 100%
rename from docs/api.rst
rename to docs/source/api.rst
diff --git a/docs/caveats.rst b/docs/source/caveats.rst
similarity index 100%
rename from docs/caveats.rst
rename to docs/source/caveats.rst
diff --git a/docs/source/changes.rst b/docs/source/changes.rst
new file mode 100644
index 0000000..f8b67d6
--- /dev/null
+++ b/docs/source/changes.rst
@@ -0,0 +1,4 @@
+Changelog
+=========
+
+.. include:: ../../CHANGES
diff --git a/docs/source/conf.py b/docs/source/conf.py
new file mode 100644
index 0000000..a999d36
--- /dev/null
+++ b/docs/source/conf.py
@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+#
+# django-treebeard documentation build configuration file, created by
+# sphinx-quickstart on Tue Nov 22 00:05:34 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import os
+import sys
+import django
+from django.conf import settings
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '_ext')))
+
+settings.configure(
+ INSTALLED_APPS=['treebeard'],
+)
+django.setup()
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+ 'djangodocs',
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.graphviz',
+ 'sphinx.ext.inheritance_diagram',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.intersphinx',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'django-treebeard'
+copyright = u'2016, Gustavo Picón'
+author = u'Gustavo Picón'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '4'
+# The full version, including alpha/beta/rc tags.
+release = '4.0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'django-treebearddoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+# author, documentclass [howto, manual, or own class]).
+latex_documents = [
+ (master_doc, 'django-treebeard.tex', u'django-treebeard Documentation',
+ u'Gustavo Picón', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ (master_doc, 'django-treebeard', u'django-treebeard Documentation',
+ [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ (master_doc, 'django-treebeard', u'django-treebeard Documentation',
+ author, 'django-treebeard', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+intersphinx_mapping = {
+ 'django': ('https://docs.djangoproject.com/en/stable/', 'https://docs.djangoproject.com/en/stable/_objects/'),
+ 'python': ('https://docs.python.org/3.5', None),
+}
diff --git a/docs/exceptions.rst b/docs/source/exceptions.rst
similarity index 100%
rename from docs/exceptions.rst
rename to docs/source/exceptions.rst
diff --git a/docs/forms.rst b/docs/source/forms.rst
similarity index 100%
rename from docs/forms.rst
rename to docs/source/forms.rst
diff --git a/docs/index.rst b/docs/source/index.rst
similarity index 100%
rename from docs/index.rst
rename to docs/source/index.rst
diff --git a/docs/install.rst b/docs/source/install.rst
similarity index 100%
rename from docs/install.rst
rename to docs/source/install.rst
diff --git a/docs/mp_tree.rst b/docs/source/mp_tree.rst
similarity index 100%
rename from docs/mp_tree.rst
rename to docs/source/mp_tree.rst
diff --git a/docs/ns_tree.rst b/docs/source/ns_tree.rst
similarity index 100%
rename from docs/ns_tree.rst
rename to docs/source/ns_tree.rst
diff --git a/docs/tests.rst b/docs/source/tests.rst
similarity index 88%
rename from docs/tests.rst
rename to docs/source/tests.rst
index b1f239a..2218bed 100644
--- a/docs/tests.rst
+++ b/docs/source/tests.rst
@@ -7,9 +7,14 @@ recommended that you run and update the test suite when you send patches.
py.test
-------
-You will need `pytest`_ to run the test suite.
+You will need `pytest`_ to run the test suite. It's included with the
+development dependencies:
-To run the test suite:
+.. code-block:: console
+
+ $ pip install -r requirements.txt
+
+Then just run the test suite:
.. code-block:: console
diff --git a/docs/tutorial.rst b/docs/source/tutorial.rst
similarity index 100%
rename from docs/tutorial.rst
rename to docs/source/tutorial.rst
diff --git a/setup.py b/setup.py
index 9d77587..26f6054 100644
--- a/setup.py
+++ b/setup.py
@@ -1,43 +1,31 @@
#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
import os
-from setuptools import setup
-from setuptools.command.test import test
+from setuptools import setup, find_packages
+from treebeard import __version__
import codecs
def root_dir():
- rd = os.path.dirname(__file__)
- if rd:
- return rd
- return '.'
-
-
-class pytest_test(test):
- def finalize_options(self):
- test.finalize_options(self)
- self.test_args = []
- self.test_suite = True
-
- def run_tests(self):
- import pytest
- pytest.main([])
+ try:
+ return os.path.dirname(__file__)
+ except NameError:
+ return '.'
setup_args = dict(
name='django-treebeard',
- version='4.0.1',
- url='https://tabo.pe/projects/django-treebeard/',
+ version=__version__,
+ url='https://github.com/django-treebeard/django-treebeard/',
author='Gustavo Picon',
author_email='tabo at tabo.pe',
license='Apache License 2.0',
- packages=['treebeard', 'treebeard.templatetags', 'treebeard.tests'],
- package_dir={'treebeard': 'treebeard'},
- package_data={
- 'treebeard': ['templates/admin/*.html', 'static/treebeard/*']},
- description='Efficient tree implementations for Django 1.7+',
- long_description=codecs.open(root_dir() + '/README.rst', encoding='utf-8').read(),
- cmdclass={'test': pytest_test},
... 827 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git
More information about the Python-modules-commits
mailing list