[med-svn] [Git][med-team/patsy][master] 2 commits: Revert "d/p/print3.patch: Make doc/conf.py python3-compatible"

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / patsy


Commits:
b878fdb9 by Nilesh Patra at 2021-09-26T20:49:49+05:30
Revert "d/p/print3.patch: Make doc/conf.py python3-compatible"

This reverts commit a4e1538206a485497b00d140b715048b778d1b09.

- - - - -
6826648b by Nilesh Patra at 2021-09-26T20:56:19+05:30
Attempt fixing sphinx problem

- - - - -


3 changed files:

- + debian/patches/fix-sphinx-conf.patch
- debian/patches/print3.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix-sphinx-conf.patch
=====================================
@@ -0,0 +1,64 @@
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -1,27 +1,27 @@
+ # -*- coding: utf-8 -*-
+ 
+ # General information about the project.
+-project = u'patsy'
+-copyright = u'2011-2015, Nathaniel J. Smith'
++project = 'patsy'
++copyright = '2011-2015, Nathaniel J. Smith'
+ 
+ import sys
+-print "python exec:", sys.executable
+-print "sys.path:", sys.path
++print("python exec:", sys.executable)
++print("sys.path:", sys.path)
+ try:
+     import numpy
+-    print "numpy: %s, %s" % (numpy.__version__, numpy.__file__)
++    print("numpy: %s, %s" % (numpy.__version__, numpy.__file__))
+ except ImportError:
+-    print "no numpy"
++    print("no numpy")
+ try:
+     import matplotlib
+-    print "matplotlib: %s, %s" % (matplotlib.__version__, matplotlib.__file__)
++    print("matplotlib: %s, %s" % (matplotlib.__version__, matplotlib.__file__))
+ except ImportError:
+-    print "no matplotlib"
++    print("no matplotlib")
+ try:
+     import IPython
+-    print "ipython: %s, %s" % (IPython.__version__, IPython.__file__)
++    print("ipython: %s, %s" % (IPython.__version__, IPython.__file__))
+ except ImportError:
+-    print "no ipython"
++    print("no ipython")
+ 
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+@@ -67,9 +67,9 @@
+ # Undocumented trick: if we def setup here in conf.py, it gets called just
+ # like an extension's setup function.
+ def setup(app):
+-    app.add_javascript("show-code.js")
+-    app.add_javascript("facebox.js")
+-    app.add_stylesheet("facebox.css")
++    app.add_js_file("show-code.js")
++    app.add_js_file("facebox.js")
++    app.add_css_file("facebox.css")
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+@@ -206,8 +206,8 @@
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, documentclass [howto/manual]).
+ latex_documents = [
+-  ('index', 'patsy.tex', u'patsy Documentation',
+-   u'Nathaniel J. Smith', 'manual'),
++  ('index', 'patsy.tex', 'patsy Documentation',
++   'Nathaniel J. Smith', 'manual'),
+ ]
+ 
+ # The name of an image file (relative to this directory) to place at the top of


=====================================
debian/patches/print3.patch
=====================================
@@ -14,54 +14,3 @@ Forwarded: no
  
     In [90]: fig = plt.figure()
  
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -1,27 +1,27 @@
- # -*- coding: utf-8 -*-
- 
- # General information about the project.
--project = u'patsy'
--copyright = u'2011-2015, Nathaniel J. Smith'
-+project = 'patsy'
-+copyright = '2011-2015, Nathaniel J. Smith'
- 
- import sys
--print "python exec:", sys.executable
--print "sys.path:", sys.path
-+print("python exec:", sys.executable)
-+print("sys.path:", sys.path)
- try:
-     import numpy
--    print "numpy: %s, %s" % (numpy.__version__, numpy.__file__)
-+    print("numpy: %s, %s" % (numpy.__version__, numpy.__file__))
- except ImportError:
--    print "no numpy"
-+    print("no numpy")
- try:
-     import matplotlib
--    print "matplotlib: %s, %s" % (matplotlib.__version__, matplotlib.__file__)
-+    print("matplotlib: %s, %s" % (matplotlib.__version__, matplotlib.__file__))
- except ImportError:
--    print "no matplotlib"
-+    print("no matplotlib")
- try:
-     import IPython
--    print "ipython: %s, %s" % (IPython.__version__, IPython.__file__)
-+    print("ipython: %s, %s" % (IPython.__version__, IPython.__file__))
- except ImportError:
--    print "no ipython"
-+    print("no ipython")
- 
- # The version info for the project you're documenting, acts as replacement for
- # |version| and |release|, also used in various other places throughout the
-@@ -206,8 +206,8 @@
- # Grouping the document tree into LaTeX files. List of tuples
- # (source start file, target name, title, author, documentclass [howto/manual]).
- latex_documents = [
--  ('index', 'patsy.tex', u'patsy Documentation',
--   u'Nathaniel J. Smith', 'manual'),
-+  ('index', 'patsy.tex', 'patsy Documentation',
-+   'Nathaniel J. Smith', 'manual'),
- ]
- 
- # The name of an image file (relative to this directory) to place at the top of


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ print3.patch
 Allow-warning-in-ipython.patch
 Remove-external-image-links.patch
 #use-collections.abc.patch
+fix-sphinx-conf.patch



View it on GitLab: https://salsa.debian.org/med-team/patsy/-/compare/517d19c0e9b84a38a1b74719f47686b9d8232ba0...6826648b90ed12e694acc592a986fbc368e05620

-- 
View it on GitLab: https://salsa.debian.org/med-team/patsy/-/compare/517d19c0e9b84a38a1b74719f47686b9d8232ba0...6826648b90ed12e694acc592a986fbc368e05620
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210926/295f6631/attachment-0001.htm>