Hello community,
here is the log from the commit of package python-django_openstack_auth for
openSUSE:Factory checked in at 2013-07-10 17:31:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django_openstack_auth (Old)
and /work/SRC/openSUSE:Factory/.python-django_openstack_auth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django_openstack_auth"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django_openstack_auth/python-django_openstack_auth.changes
2013-06-13 21:38:53.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-django_openstack_auth.new/python-django_openstack_auth.changes
2013-07-10 17:31:39.000000000 +0200
@@ -1,0 +2,23 @@
+Tue Jul 9 12:16:14 UTC 2013 - [email protected]
+
+- add fix-testsuite.diff
+
+-------------------------------------------------------------------
+Sat Jun 22 16:01:37 UTC 2013 - [email protected]
+
+- add newer-keystoneclient.diff
+
+-------------------------------------------------------------------
+Thu Jun 13 10:09:34 UTC 2013 - [email protected]
+
+- add python-argparse dependency
+
+-------------------------------------------------------------------
+Fri Jun 7 13:18:37 UTC 2013 - [email protected]
+
+- update to 1.0.11:
+ * fix tarball
+ * fix tests
+- enable tests
+
+-------------------------------------------------------------------
Old:
----
django_openstack_auth-1.0.10.tar.gz
New:
----
django_openstack_auth-1.0.11.tar.gz
fix-testsuite.diff
newer-keystoneclient.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django_openstack_auth.spec ++++++
--- /var/tmp/diff_new_pack.jA3nB5/_old 2013-07-10 17:31:39.000000000 +0200
+++ /var/tmp/diff_new_pack.jA3nB5/_new 2013-07-10 17:31:39.000000000 +0200
@@ -17,15 +17,17 @@
Name: python-django_openstack_auth
-Version: 1.0.10
+Version: 1.0.11
Release: 0
Summary: A Django auth backend for use with the OpenStack Keystone
License: BSD-3-Clause
Group: Development/Languages/Python
Url: http://django_openstack_auth.readthedocs.org/
Source:
http://pypi.python.org/packages/source/d/django_openstack_auth/django_openstack_auth-%{version}.tar.gz
-Patch0: docs-update.diff
+Patch0: newer-keystoneclient.diff
+Patch1: fix-testsuite.diff
BuildRequires: python-Sphinx
+BuildRequires: python-argparse
BuildRequires: python-devel
BuildRequires: python-django
BuildRequires: python-keystoneclient
@@ -48,7 +50,8 @@
%prep
%setup -q -n django_openstack_auth-%{version}
-%patch0 -p1
+%patch0
+%patch1 -p1
%build
python setup.py build
@@ -57,9 +60,8 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-#TODO/FIXME: Breaks:
-#%%check
-#python setup.py test
+%check
+python setup.py test
%files
%defattr(-,root,root,-)
++++++ django_openstack_auth-1.0.10.tar.gz ->
django_openstack_auth-1.0.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django_openstack_auth-1.0.10/MANIFEST.in
new/django_openstack_auth-1.0.11/MANIFEST.in
--- old/django_openstack_auth-1.0.10/MANIFEST.in 2013-04-26
00:30:11.000000000 +0200
+++ new/django_openstack_auth-1.0.11/MANIFEST.in 2013-06-05
08:55:04.000000000 +0200
@@ -1,6 +1,6 @@
-recursive-include docs *.rst
+recursive-include docs *.rst *.py *.bat Makefile
recursive-include openstack_auth/locale *
recursive-include openstack_auth/tests/templates *.html
include LICENSE
-include README.rst
\ No newline at end of file
+include README.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django_openstack_auth-1.0.10/PKG-INFO
new/django_openstack_auth-1.0.11/PKG-INFO
--- old/django_openstack_auth-1.0.10/PKG-INFO 2013-05-20 20:22:37.000000000
+0200
+++ new/django_openstack_auth-1.0.11/PKG-INFO 2013-06-05 08:57:35.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django_openstack_auth
-Version: 1.0.10
+Version: 1.0.11
Summary: A Django authentication backend for use with the OpenStack Keystone
Identity backend.
Home-page: http://django_openstack_auth.readthedocs.org/
Author: Gabriel Hurley
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django_openstack_auth-1.0.10/django_openstack_auth.egg-info/PKG-INFO
new/django_openstack_auth-1.0.11/django_openstack_auth.egg-info/PKG-INFO
--- old/django_openstack_auth-1.0.10/django_openstack_auth.egg-info/PKG-INFO
2013-05-20 20:22:37.000000000 +0200
+++ new/django_openstack_auth-1.0.11/django_openstack_auth.egg-info/PKG-INFO
2013-06-05 08:57:35.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-openstack-auth
-Version: 1.0.10
+Version: 1.0.11
Summary: A Django authentication backend for use with the OpenStack Keystone
Identity backend.
Home-page: http://django_openstack_auth.readthedocs.org/
Author: Gabriel Hurley
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django_openstack_auth-1.0.10/django_openstack_auth.egg-info/SOURCES.txt
new/django_openstack_auth-1.0.11/django_openstack_auth.egg-info/SOURCES.txt
--- old/django_openstack_auth-1.0.10/django_openstack_auth.egg-info/SOURCES.txt
2013-05-20 20:22:37.000000000 +0200
+++ new/django_openstack_auth-1.0.11/django_openstack_auth.egg-info/SOURCES.txt
2013-06-05 08:57:35.000000000 +0200
@@ -8,8 +8,11 @@
django_openstack_auth.egg-info/not-zip-safe
django_openstack_auth.egg-info/requires.txt
django_openstack_auth.egg-info/top_level.txt
+docs/Makefile
+docs/conf.py
docs/index.rst
docs/installation.rst
+docs/make.bat
docs/ref/backend.rst
docs/ref/forms.rst
docs/ref/user.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django_openstack_auth-1.0.10/docs/Makefile
new/django_openstack_auth-1.0.11/docs/Makefile
--- old/django_openstack_auth-1.0.10/docs/Makefile 1970-01-01
01:00:00.000000000 +0100
+++ new/django_openstack_auth-1.0.11/docs/Makefile 2013-04-26
00:30:11.000000000 +0200
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp
epub latex latexpdf text man changes linkcheck doctest 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 " 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 " 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 " 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 " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation
(if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/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
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator
$(BUILDDIR)/qthelp/DjangoOpenStackAuth.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile
$(BUILDDIR)/qthelp/DjangoOpenStackAuth.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/DjangoOpenStackAuth"
+ @echo "# ln -s $(BUILDDIR)/devhelp
$$HOME/.local/share/devhelp/DjangoOpenStackAuth"
+ @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' 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."
+
+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
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django_openstack_auth-1.0.10/docs/conf.py
new/django_openstack_auth-1.0.11/docs/conf.py
--- old/django_openstack_auth-1.0.10/docs/conf.py 1970-01-01
01:00:00.000000000 +0100
+++ new/django_openstack_auth-1.0.11/docs/conf.py 2013-04-26
00:30:11.000000000 +0200
@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+#
+# Django OpenStack Auth documentation build configuration file, created by
+# sphinx-quickstart on Sun Jul 8 15:13:36 2012.
+#
+# 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 sys, os
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_auth.tests.settings'
+
+import openstack_auth
+
+# 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.insert(0, os.path.abspath('.'))
+
+# -- 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 = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+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 OpenStack Auth'
+copyright = u'2012, Gabriel Hurley'
+
+# 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 = openstack_auth.__version__
+# The full version, including alpha/beta/rc tags.
+release = openstack_auth.__version__
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#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 = ['_build']
+
+# 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 = []
+
+
+# -- 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']
+
+# 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
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'DjangoOpenStackAuthdoc'
+
+
+# -- 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': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass
[howto/manual]).
+latex_documents = [
+ ('index', 'DjangoOpenStackAuth.tex', u'Django OpenStack Auth Documentation',
+ u'Gabriel Hurley', '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 = [
+ ('index', 'djangoopenstackauth', u'Django OpenStack Auth Documentation',
+ [u'Gabriel Hurley'], 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 = [
+ ('index', 'DjangoOpenStackAuth', u'Django OpenStack Auth Documentation',
+ u'Gabriel Hurley', 'DjangoOpenStackAuth', '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'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django_openstack_auth-1.0.10/docs/make.bat
new/django_openstack_auth-1.0.11/docs/make.bat
--- old/django_openstack_auth-1.0.10/docs/make.bat 1970-01-01
01:00:00.000000000 +0100
+++ new/django_openstack_auth-1.0.11/docs/make.bat 2013-04-26
00:30:11.000000000 +0200
@@ -0,0 +1,190 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+ set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+ set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+ set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+ :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. 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. 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. text to make text files
+ echo. man to make manual pages
+ echo. texinfo to make Texinfo files
+ echo. gettext to make PO message catalogs
+ echo. changes to make an overview over 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
+ goto end
+)
+
+if "%1" == "clean" (
+ for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+ del /q /s %BUILDDIR%\*
+ goto end
+)
+
+if "%1" == "html" (
+ %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+ goto end
+)
+
+if "%1" == "dirhtml" (
+ %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+ goto end
+)
+
+if "%1" == "singlehtml" (
+ %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+ goto end
+)
+
+if "%1" == "pickle" (
+ %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the pickle files.
+ goto end
+)
+
+if "%1" == "json" (
+ %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can process the JSON files.
+ goto end
+)
+
+if "%1" == "htmlhelp" (
+ %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+ goto end
+)
+
+if "%1" == "qthelp" (
+ %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+ echo.^> qcollectiongenerator %BUILDDIR%\qthelp\DjangoOpenStackAuth.qhcp
+ echo.To view the help file:
+ echo.^> assistant -collectionFile
%BUILDDIR%\qthelp\DjangoOpenStackAuth.ghc
+ goto end
+)
+
+if "%1" == "devhelp" (
+ %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished.
+ goto end
+)
+
+if "%1" == "epub" (
+ %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The epub file is in %BUILDDIR%/epub.
+ goto end
+)
+
+if "%1" == "latex" (
+ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+ goto end
+)
+
+if "%1" == "text" (
+ %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The text files are in %BUILDDIR%/text.
+ goto end
+)
+
+if "%1" == "man" (
+ %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The manual pages are in %BUILDDIR%/man.
+ goto end
+)
+
+if "%1" == "texinfo" (
+ %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+ goto end
+)
+
+if "%1" == "gettext" (
+ %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+ goto end
+)
+
+if "%1" == "changes" (
+ %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.The overview file is in %BUILDDIR%/changes.
+ goto end
+)
+
+if "%1" == "linkcheck" (
+ %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+ goto end
+)
+
+if "%1" == "doctest" (
+ %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+ if errorlevel 1 exit /b 1
+ echo.
+ echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+ goto end
+)
+
+:end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django_openstack_auth-1.0.10/openstack_auth/__init__.py
new/django_openstack_auth-1.0.11/openstack_auth/__init__.py
--- old/django_openstack_auth-1.0.10/openstack_auth/__init__.py 2013-05-20
20:21:22.000000000 +0200
+++ new/django_openstack_auth-1.0.11/openstack_auth/__init__.py 2013-06-05
08:56:51.000000000 +0200
@@ -1,2 +1,2 @@
# following PEP 386
-__version__ = "1.0.10"
+__version__ = "1.0.11"
++++++ fix-testsuite.diff ++++++
commit a13abea67f0ccdf62489f3fd65e449132b3606cd
Author: Sascha Peilicke <[email protected]>
Date: Mon Jul 1 10:58:43 2013 +0200
Fix testsuite after "Support keystoneclient 0.2.5+"
access.AccessInfo.factory() does a (keystone) API version check, thus
add versioned_scoped_token_dict to tests/data.py.
Index: django_openstack_auth-1.0.11/openstack_auth/tests/data.py
===================================================================
--- django_openstack_auth-1.0.11.orig/openstack_auth/tests/data.py
+++ django_openstack_auth-1.0.11/openstack_auth/tests/data.py
@@ -126,7 +126,7 @@ def generate_test_data():
loaded=True)
# Service Catalog
- test_data.service_catalog = ServiceCatalog({
+ test_data.service_catalog = ServiceCatalog.factory({
'serviceCatalog': [keystone_service, nova_service],
'token': {
'id': scoped_token_dict['token']['id'],
@@ -136,6 +136,9 @@ def generate_test_data():
}
})
- test_data.access_info = access.AccessInfo(scoped_token_dict)
+ versioned_scoped_toked_dict = scoped_token_dict
+ versioned_scoped_toked_dict['version'] = 'v2.0'
+
+ test_data.access_info = access.AccessInfo(versioned_scoped_toked_dict)
return test_data
++++++ newer-keystoneclient.diff ++++++
--- openstack_auth/tests/data.py
+++ openstack_auth/tests/data.py
@@ -9,6 +9,7 @@
from keystoneclient.v2_0.tokens import Token, TokenManager
from keystoneclient.v2_0.users import User, UserManager
from keystoneclient.service_catalog import ServiceCatalog
+from keystoneclient import access
class TestDataContainer(object):
@@ -135,4 +136,6 @@
}
})
+ test_data.access_info = access.AccessInfo(scoped_token_dict)
+
return test_data
--- openstack_auth/tests/tests.py
+++ openstack_auth/tests/tests.py
@@ -17,8 +17,10 @@
self.mox = mox.Mox()
self.data = generate_test_data()
endpoint = settings.OPENSTACK_KEYSTONE_URL
- self.keystone_client = client.Client(endpoint=endpoint)
- self.keystone_client.service_catalog = self.data.service_catalog
+ self.keystone_client = client.Client(endpoint=endpoint,
+ auth_ref=self.data.access_info)
+ if not hasattr(self.keystone_client, 'service_catalog'):
+ self.keystone_client.service_catalog = self.data.service_catalog
def tearDown(self):
self.mox.UnsetStubs()
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
