[pysal] 05/06: Drop patches applied upstream.
Bas Couwenberg
sebastic at debian.org
Fri Sep 30 10:55:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pysal.
commit 4e65d0a334a8fc611c6dfed9939435e1305c37fb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 30 12:16:20 2016 +0200
Drop patches applied upstream.
---
debian/changelog | 1 +
debian/patches/reproducible-build-and-output.patch | 27 -----
debian/patches/series | 2 -
debian/patches/taberror.patch | 132 ---------------------
4 files changed, 1 insertion(+), 161 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f17ce15..9045997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pysal (1.12.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
* Add recommended dependencies.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Fri, 30 Sep 2016 11:47:31 +0200
diff --git a/debian/patches/reproducible-build-and-output.patch b/debian/patches/reproducible-build-and-output.patch
deleted file mode 100644
index dba8856..0000000
--- a/debian/patches/reproducible-build-and-output.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Make the output and build reproducible
-Author: Chris Lamb <lamby at debian.org>
-Forwarded: https://github.com/pysal/pysal/pull/856
-Applied-Upstream: https://github.com/pysal/pysal/commit/433d9d714f9620fb901ec823415de3edd7a29d1d
-
---- a/pysal/core/IOHandlers/pyDbfIO.py
-+++ b/pysal/core/IOHandlers/pyDbfIO.py
-@@ -4,6 +4,8 @@ import struct
- import itertools
- from warnings import warn
- import pysal
-+import os
-+import time
-
- __author__ = "Charles R Schmidt <schmidtc at gmail.com>"
- __all__ = ['DBF']
-@@ -272,7 +274,9 @@ class DBF(pysal.core.Tables.DataTable):
- POS = self.f.tell()
- self.f.seek(0)
- ver = 3
-- now = datetime.datetime.now()
-+ now = datetime.datetime.utcfromtimestamp(
-+ int(os.environ.get('SOURCE_DATE_EPOCH', time.time())),
-+ )
- yr, mon, day = now.year - 1900, now.month, now.day
- numrec = self.numrec
- numfields = len(self.header)
diff --git a/debian/patches/series b/debian/patches/series
index 8600986..347d63d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
unusual-interpreter.patch
-reproducible-build-and-output.patch
-taberror.patch
diff --git a/debian/patches/taberror.patch b/debian/patches/taberror.patch
deleted file mode 100644
index bd94b29..0000000
--- a/debian/patches/taberror.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-Description: Fix TabErrors.
- Sorry: TabError: inconsistent use of tabs and spaces in indentation (klincs.py, line 34)
- Sorry: TabError: inconsistent use of tabs and spaces in indentation (lincs.py, line 287)
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/pysal/pysal/pull/857
-Applied-Upstream: https://github.com/pysal/pysal/commit/ac6c15ffa5ec48d2429aaffdd4cf157a228c6c46
-
---- a/pysal/contrib/network/klincs.py
-+++ b/pysal/contrib/network/klincs.py
-@@ -31,11 +31,11 @@ class WeightedRandomSampleGenerator(obje
- """
-
- def __init__(self, weights, population, n):
-- """
-- weights: an iterable with m numeric elements
-- population: a numpy array with m elements
-- n: an integer representing sample size
-- """
-+ """
-+ weights: an iterable with m numeric elements
-+ population: a numpy array with m elements
-+ n: an integer representing sample size
-+ """
- self.totals = np.cumsum(weights)
- self.population = population
- self.n = n
-@@ -57,10 +57,10 @@ class RandomSampleGenerator(object):
- from a population group
- """
- def __init__(self, population, n):
-- """
-- population: a numpy array with m elements
-- n: an integer representing sample size
-- """
-+ """
-+ population: a numpy array with m elements
-+ n: an integer representing sample size
-+ """
- self.population = population
- self.n = n
-
---- a/pysal/contrib/network/lincs.py
-+++ b/pysal/contrib/network/lincs.py
-@@ -284,11 +284,11 @@ def lincs(network, event, base, weight,
- w, edges, e, b, edges_geom = None, None, None, None, []
- if weight == 'Node-based':
- w, edges = node_weights(network, attribute=True)
-- n = len(edges)
-- e, b = np.zeros(n), np.zeros(n)
-- for edge in edges:
-+ n = len(edges)
-+ e, b = np.zeros(n), np.zeros(n)
-+ for edge in edges:
- edges_geom.append(edges[edge][0])
-- e[edge] = edges[edge][event]
-+ e[edge] = edges[edge][event]
- b[edge] = getBase(edges, edge, base)
- w.id_order = edges.keys()
- elif dist is not None:
-@@ -298,50 +298,50 @@ def lincs(network, event, base, weight,
- network[n1][n2] = network[n1][n2][0]
- w, edges = dist_weights(network, id2edgepoints, edge2id, dist)
- n = len(id2attr)
-- e, b = np.zeros(n), np.zeros(n)
-+ e, b = np.zeros(n), np.zeros(n)
- if base:
- base -= 1
-- for edge in id2attr:
-+ for edge in id2attr:
- edges_geom.append(edges[edge])
-- e[edge] = id2attr[edge][event - 1]
-+ e[edge] = id2attr[edge][event - 1]
- b[edge] = getBase(id2attr, edge, base)
- w.id_order = id2attr.keys()
-
- Is, p_sim, Zs = None,None, None
- if sim_method == 'permutation':
- if lisa_func == pysal.esda.moran.Moran_Local:
-- lisa_i = lisa_func(e*1.0/b,w,transformation="r",permutations=sim_num)
-+ lisa_i = lisa_func(e*1.0/b,w,transformation="r",permutations=sim_num)
- Is = lisa_i.Is
- Zs = lisa_i.q
- else:
-- lisa_i = lisa_func(e*1.0/b,w,transform="R",permutations=sim_num,star=star)
-+ lisa_i = lisa_func(e*1.0/b,w,transform="R",permutations=sim_num,star=star)
- Is = lisa_i.Gs
- Zs = lisa_i.Zs
- p_sim = lisa_i.p_sim
- else:
-- sims = None
-+ sims = None
- if lisa_func == pysal.esda.moran.Moran_Local:
-- lisa_i = lisa_func(e*1.0/b,w,transformation="r",permutations=0)
-+ lisa_i = lisa_func(e*1.0/b,w,transformation="r",permutations=0)
- Is = lisa_i.Is
- Zs = lisa_i.q
- else:
-- lisa_i = lisa_func(e*1.0/b,w,transform="R",permutations=0,star=star)
-- Is = lisa_i.Gs
-- Zs = lisa_i.Zs
-- if sim_method == 'binomial':
-- sims = unconditional_sim(e, b, sim_num)
-- elif sim_method == 'poisson':
-- sims = unconditional_sim_poisson(e, b, sim_num)
-- else:
-- sims = conditional_multinomial(e, b, sim_num)
-+ lisa_i = lisa_func(e*1.0/b,w,transform="R",permutations=0,star=star)
-+ Is = lisa_i.Gs
-+ Zs = lisa_i.Zs
-+ if sim_method == 'binomial':
-+ sims = unconditional_sim(e, b, sim_num)
-+ elif sim_method == 'poisson':
-+ sims = unconditional_sim_poisson(e, b, sim_num)
-+ else:
-+ sims = conditional_multinomial(e, b, sim_num)
- if lisa_func == pysal.esda.moran.Moran_Local:
-- for i in range(sim_num):
-- sims[:,i] = lisa_func(sims[:,i]*1.0/b,w,transformation="r",permutations=0).Is
-+ for i in range(sim_num):
-+ sims[:,i] = lisa_func(sims[:,i]*1.0/b,w,transformation="r",permutations=0).Is
- else:
-- for i in range(sim_num):
-- sims[:,i] = lisa_func(sims[:,i]*1.0/b,w,permutations=0,star=star).Gs
-- sim_res = pseudo_pvalues(Is, sims)
-- p_sim = sim_res[0]
-+ for i in range(sim_num):
-+ sims[:,i] = lisa_func(sims[:,i]*1.0/b,w,permutations=0,star=star).Gs
-+ sim_res = pseudo_pvalues(Is, sims)
-+ p_sim = sim_res[0]
-
- w.transform = 'O'
- return zip(edges_geom, e, b, Is, Zs, p_sim), w
--
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