[pysal] 04/08: Drop TabError.patch, applied upstream.

Bas Couwenberg sebastic at debian.org
Mon Nov 6 19:01:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pysal.

commit 0284ffdc0096a3a588534739d53d04d3c63e43f6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Nov 6 07:57:01 2017 +0100

    Drop TabError.patch, applied upstream.
---
 debian/changelog              |  1 +
 debian/patches/TabError.patch | 38 --------------------------------------
 debian/patches/series         |  1 -
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f44ff36..02b2622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pysal (1.14.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Drop TabError.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 06 Nov 2017 07:54:41 +0100
 
diff --git a/debian/patches/TabError.patch b/debian/patches/TabError.patch
deleted file mode 100644
index dbb56f9..0000000
--- a/debian/patches/TabError.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix inconsistent use of tabs and spaces in indentation.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/876700
-Forwarded: https://github.com/pysal/pysal/pull/983
-
---- a/pysal/contrib/glm/iwls.py
-+++ b/pysal/contrib/glm/iwls.py
-@@ -45,7 +45,7 @@ def iwls(y, x, family, offset, y_fix,
-     diff = 1.0e6
-     
-     if ini_betas is None:
--    	betas = np.zeros((x.shape[1], 1), np.float)
-+        betas = np.zeros((x.shape[1], 1), np.float)
-     else:
-         betas = ini_betas
- 
-@@ -53,9 +53,9 @@ def iwls(y, x, family, offset, y_fix,
-         y = family.link._clean(y)
-     if isinstance(family, Poisson):
-         y_off = y/offset
--    	y_off = family.starting_mu(y_off)
--    	v = family.predict(y_off)
--    	mu = family.starting_mu(y)
-+        y_off = family.starting_mu(y_off)
-+        v = family.predict(y_off)
-+        mu = family.starting_mu(y)
-     else:
-         mu = family.starting_mu(y)
-         v = family.predict(mu)
-@@ -78,7 +78,7 @@ def iwls(y, x, family, offset, y_fix,
-         mu  = family.fitted(v)
- 
-         if isinstance(family, Poisson):
--        	mu = mu * offset
-+            mu = mu * offset
- 
-         diff = min(abs(n_betas-betas))
-         betas = n_betas
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6884635..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-TabError.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pysal.git



More information about the Pkg-grass-devel mailing list