[Python-modules-commits] [python-intbitset] 01/03: Add patch: Rename-version.py-to-intbitset_version.py.patch

[Maximiliano Curia]

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

maxy pushed a commit to branch debian/master
in repository python-intbitset.

commit 8ffdabaae8789b3c7b1b41097b62b65cb001c2fb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Aug 11 00:22:02 2017 +0200

    Add patch: Rename-version.py-to-intbitset_version.py.patch
---
 ...Rename-version.py-to-intbitset_version.py.patch | 133 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 134 insertions(+)

diff --git a/debian/patches/Rename-version.py-to-intbitset_version.py.patch b/debian/patches/Rename-version.py-to-intbitset_version.py.patch
new file mode 100644
index 0000000..181f535
--- /dev/null
+++ b/debian/patches/Rename-version.py-to-intbitset_version.py.patch
@@ -0,0 +1,133 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Fri, 11 Aug 2017 00:21:11 +0200
+Subject: Rename version.py to intbitset_version.py
+
+This is to avoid polluting the namespace
+---
+ docs/conf.py                   |  2 +-
+ intbitset/intbitset.pyx        |  2 +-
+ intbitset/intbitset_version.py | 29 +++++++++++++++++++++++++++++
+ intbitset/version.py           | 29 -----------------------------
+ setup.py                       |  4 ++--
+ 5 files changed, 33 insertions(+), 33 deletions(-)
+ create mode 100644 intbitset/intbitset_version.py
+ delete mode 100644 intbitset/version.py
+
+diff --git a/docs/conf.py b/docs/conf.py
+index c0336a1..12bc411 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -54,7 +54,7 @@ copyright = u'2013, 2014, 2015 CERN'
+ # The short X.Y version.
+ 
+ # Get the version string. Cannot be done with import!
+-with open(os.path.join('..', 'intbitset', 'version.py'), 'rt') as f:
++with open(os.path.join('..', 'intbitset', 'intbitset_version.py'), 'rt') as f:
+     version = re.search(
+         '__version__\s*=\s*"(?P<version>.*)"\n',
+         f.read()
+diff --git a/intbitset/intbitset.pyx b/intbitset/intbitset.pyx
+index 96837f4..36dc408 100644
+--- a/intbitset/intbitset.pyx
++++ b/intbitset/intbitset.pyx
+@@ -49,7 +49,7 @@ import six
+ from array import array
+ CFG_INTBITSET_ENABLE_SANITY_CHECKS = False
+ from intbitset_helper import _
+-from version import __version__
++from intbitset_version import __version__
+ 
+ __all__ = ['intbitset', '__version__']
+ 
+diff --git a/intbitset/intbitset_version.py b/intbitset/intbitset_version.py
+new file mode 100644
+index 0000000..93e1626
+--- /dev/null
++++ b/intbitset/intbitset_version.py
+@@ -0,0 +1,29 @@
++# -*- coding: utf-8 -*-
++#
++# This file is part of intbitset
++# Copyright (C) 2015, 2016 CERN.
++#
++# intbitset is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 3 of the
++# License, or (at your option) any later version.
++#
++# intbitset is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with intbitset; if not, write to the Free Software Foundation,
++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
++#
++# In applying this licence, CERN does not waive the privileges and immunities
++# granted to it by virtue of its status as an Intergovernmental Organization
++# or submit itself to any jurisdiction.
++
++"""Version information for intbitset."""
++
++# Do not change the format of this next line. Doing so risks breaking
++# setup.py and docs/conf.py
++
++__version__ = "2.3.0"
+diff --git a/intbitset/version.py b/intbitset/version.py
+deleted file mode 100644
+index 93e1626..0000000
+--- a/intbitset/version.py
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# -*- coding: utf-8 -*-
+-#
+-# This file is part of intbitset
+-# Copyright (C) 2015, 2016 CERN.
+-#
+-# intbitset is free software; you can redistribute it and/or
+-# modify it under the terms of the GNU Lesser General Public License as
+-# published by the Free Software Foundation; either version 3 of the
+-# License, or (at your option) any later version.
+-#
+-# intbitset is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# Lesser General Public License for more details.
+-#
+-# You should have received a copy of the GNU Lesser General Public License
+-# along with intbitset; if not, write to the Free Software Foundation,
+-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+-#
+-# In applying this licence, CERN does not waive the privileges and immunities
+-# granted to it by virtue of its status as an Intergovernmental Organization
+-# or submit itself to any jurisdiction.
+-
+-"""Version information for intbitset."""
+-
+-# Do not change the format of this next line. Doing so risks breaking
+-# setup.py and docs/conf.py
+-
+-__version__ = "2.3.0"
+diff --git a/setup.py b/setup.py
+index 6866014..c0efe63 100644
+--- a/setup.py
++++ b/setup.py
+@@ -28,7 +28,7 @@ import os
+ import re
+ 
+ # Get the version string. Cannot be done with import!
+-with open(os.path.join('intbitset', 'version.py'), 'rt') as f:
++with open(os.path.join('intbitset', 'intbitset_version.py'), 'rt') as f:
+     version = re.search(
+         '__version__\s*=\s*"(?P<version>.*)"\n',
+         f.read()
+@@ -44,7 +44,7 @@ setup(
+     description=__doc__,
+     long_description=open('README.rst').read(),
+     package_dir={'': 'intbitset'},
+-    py_modules=['intbitset_helper', 'version'],
++    py_modules=['intbitset_helper', 'intbitset_version'],
+     ext_modules=[
+         Extension("intbitset",
+                   ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"],
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fbcf8c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Rename-version.py-to-intbitset_version.py.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-intbitset.git