[Python-modules-commits] [flufl.lock] 01/03: Import flufl.lock_2.4.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Sat Oct 10 21:45:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository flufl.lock.
commit 9eb8a3737fb9aa01954a97aefea375b69d42049a
Author: Barry Warsaw <barry at python.org>
Date: Sat Oct 10 15:56:23 2015 -0400
Import flufl.lock_2.4.orig.tar.gz
---
PKG-INFO | 57 ++++++++++++++++++----------------
README.rst | 48 ++++++++++++++--------------
flufl.lock.egg-info/PKG-INFO | 57 ++++++++++++++++++----------------
flufl/__init__.py | 2 +-
flufl/lock/NEWS.rst | 5 +++
flufl/lock/README.rst | 33 ++++++--------------
flufl/lock/__init__.py | 4 +--
flufl/lock/_lockfile.py | 20 ++++++------
flufl/lock/conf.py | 2 +-
flufl/lock/tests/subproc.py | 2 +-
flufl/lock/tests/test_documentation.py | 5 +--
flufl/lock/tests/test_lockfile.py | 4 +--
setup.py | 4 +--
setup_helpers.py | 25 +++++++--------
template.py | 2 +-
15 files changed, 131 insertions(+), 139 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 0907321..c45947e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,7 +1,7 @@
Metadata-Version: 1.1
Name: flufl.lock
-Version: 2.3.1
-Summary: NFS-safe file locking with timeouts for POSIX systems
+Version: 2.4
+Summary: NFS-safe file locking with timeouts for POSIX systems.
Home-page: http://launchpad.net/flufl.lock
Author: Barry Warsaw
Author-email: barry at python.org
@@ -11,23 +11,23 @@ Description: ==========
flufl.lock
==========
- NFS-safe file locking with timeouts for POSIX systems
+ NFS-safe file locking with timeouts for POSIX systems.
- The ``flufl.lock`` library provides an NFS-safe file-based locking algorithm
+ The `flufl.lock` library provides an NFS-safe file-based locking algorithm
influenced by the GNU/Linux `open(2)` manpage, under the description of the
- `O_EXCL` option::
+ `O_EXCL` option.
- [...] O_EXCL is broken on NFS file systems, programs which rely on it
- for performing locking tasks will contain a race condition. The
- solution for performing atomic file locking using a lockfile is to
- create a unique file on the same fs (e.g., incorporating hostname and
- pid), use link(2) to make a link to the lockfile. If link() returns
- 0, the lock is successful. Otherwise, use stat(2) on the unique file
- to check if its link count has increased to 2, in which case the lock
- is also successful.
+ [...] O_EXCL is broken on NFS file systems, programs which rely on it
+ for performing locking tasks will contain a race condition. The
+ solution for performing atomic file locking using a lockfile is to
+ create a unique file on the same fs (e.g., incorporating hostname and
+ pid), use link(2) to make a link to the lockfile. If link() returns
+ 0, the lock is successful. Otherwise, use stat(2) on the unique file
+ to check if its link count has increased to 2, in which case the lock
+ is also successful.
The assumption made here is that there will be no *outside interference*,
- e.g. no agent external to this code will ever ``link()`` to the specific lock
+ e.g. no agent external to this code will ever `link()` to the specific lock
files used.
Lock objects support lock-breaking so that you can't wedge a process forever.
@@ -43,27 +43,32 @@ Description: ==========
your clocks are properly synchronized.
- License
- =======
+ Author
+ ======
+
+ `flufl.lock` is Copyright (C) 2007-2015 Barry Warsaw <barry at python.org>
- This file is part of flufl.lock.
+ Licensed under the terms of the GNU Lesser General Public License, version 3
+ or later. See the COPYING.LESSER file for details.
- flufl.lock 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, version 3 of the License.
- flufl.lock 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.
+ Project details
+ ===============
- You should have received a copy of the GNU Lesser General Public License
- along with flufl.lock. If not, see <http://www.gnu.org/licenses/>.
+ * Project home: https://gitlab.com/warsaw/flufl.lock
+ * Report bugs at: https://gitlab.com/warsaw/flufl.lock/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.lock.git
+ * Documentation: http://flufllock.readthedocs.org/
===================
NEWS for flufl.lock
===================
+ 2.4 (2015-10-10)
+ ================
+ * Drop Python 2.6 compatibility.
+ * Add Python 3.5 compatibility.
+
2.3.1 (2014-09-26)
==================
* Include MANIFEST.in in the sdist tarball, otherwise the Debian package
diff --git a/README.rst b/README.rst
index 25135bc..dcca0f5 100644
--- a/README.rst
+++ b/README.rst
@@ -2,23 +2,23 @@
flufl.lock
==========
-NFS-safe file locking with timeouts for POSIX systems
+NFS-safe file locking with timeouts for POSIX systems.
-The ``flufl.lock`` library provides an NFS-safe file-based locking algorithm
+The `flufl.lock` library provides an NFS-safe file-based locking algorithm
influenced by the GNU/Linux `open(2)` manpage, under the description of the
-`O_EXCL` option::
+`O_EXCL` option.
- [...] O_EXCL is broken on NFS file systems, programs which rely on it
- for performing locking tasks will contain a race condition. The
- solution for performing atomic file locking using a lockfile is to
- create a unique file on the same fs (e.g., incorporating hostname and
- pid), use link(2) to make a link to the lockfile. If link() returns
- 0, the lock is successful. Otherwise, use stat(2) on the unique file
- to check if its link count has increased to 2, in which case the lock
- is also successful.
+ [...] O_EXCL is broken on NFS file systems, programs which rely on it
+ for performing locking tasks will contain a race condition. The
+ solution for performing atomic file locking using a lockfile is to
+ create a unique file on the same fs (e.g., incorporating hostname and
+ pid), use link(2) to make a link to the lockfile. If link() returns
+ 0, the lock is successful. Otherwise, use stat(2) on the unique file
+ to check if its link count has increased to 2, in which case the lock
+ is also successful.
The assumption made here is that there will be no *outside interference*,
-e.g. no agent external to this code will ever ``link()`` to the specific lock
+e.g. no agent external to this code will ever `link()` to the specific lock
files used.
Lock objects support lock-breaking so that you can't wedge a process forever.
@@ -34,19 +34,19 @@ data. In a distributed (NFS) environment, you also need to make sure that
your clocks are properly synchronized.
-License
-=======
+Author
+======
-This file is part of flufl.lock.
+`flufl.lock` is Copyright (C) 2007-2015 Barry Warsaw <barry at python.org>
-flufl.lock 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, version 3 of the License.
+Licensed under the terms of the GNU Lesser General Public License, version 3
+or later. See the COPYING.LESSER file for details.
-flufl.lock 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 flufl.lock. If not, see <http://www.gnu.org/licenses/>.
+Project details
+===============
+
+ * Project home: https://gitlab.com/warsaw/flufl.lock
+ * Report bugs at: https://gitlab.com/warsaw/flufl.lock/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.lock.git
+ * Documentation: http://flufllock.readthedocs.org/
diff --git a/flufl.lock.egg-info/PKG-INFO b/flufl.lock.egg-info/PKG-INFO
index 0907321..c45947e 100644
--- a/flufl.lock.egg-info/PKG-INFO
+++ b/flufl.lock.egg-info/PKG-INFO
@@ -1,7 +1,7 @@
Metadata-Version: 1.1
Name: flufl.lock
-Version: 2.3.1
-Summary: NFS-safe file locking with timeouts for POSIX systems
+Version: 2.4
+Summary: NFS-safe file locking with timeouts for POSIX systems.
Home-page: http://launchpad.net/flufl.lock
Author: Barry Warsaw
Author-email: barry at python.org
@@ -11,23 +11,23 @@ Description: ==========
flufl.lock
==========
- NFS-safe file locking with timeouts for POSIX systems
+ NFS-safe file locking with timeouts for POSIX systems.
- The ``flufl.lock`` library provides an NFS-safe file-based locking algorithm
+ The `flufl.lock` library provides an NFS-safe file-based locking algorithm
influenced by the GNU/Linux `open(2)` manpage, under the description of the
- `O_EXCL` option::
+ `O_EXCL` option.
- [...] O_EXCL is broken on NFS file systems, programs which rely on it
- for performing locking tasks will contain a race condition. The
- solution for performing atomic file locking using a lockfile is to
- create a unique file on the same fs (e.g., incorporating hostname and
- pid), use link(2) to make a link to the lockfile. If link() returns
- 0, the lock is successful. Otherwise, use stat(2) on the unique file
- to check if its link count has increased to 2, in which case the lock
- is also successful.
+ [...] O_EXCL is broken on NFS file systems, programs which rely on it
+ for performing locking tasks will contain a race condition. The
+ solution for performing atomic file locking using a lockfile is to
+ create a unique file on the same fs (e.g., incorporating hostname and
+ pid), use link(2) to make a link to the lockfile. If link() returns
+ 0, the lock is successful. Otherwise, use stat(2) on the unique file
+ to check if its link count has increased to 2, in which case the lock
+ is also successful.
The assumption made here is that there will be no *outside interference*,
- e.g. no agent external to this code will ever ``link()`` to the specific lock
+ e.g. no agent external to this code will ever `link()` to the specific lock
files used.
Lock objects support lock-breaking so that you can't wedge a process forever.
@@ -43,27 +43,32 @@ Description: ==========
your clocks are properly synchronized.
- License
- =======
+ Author
+ ======
+
+ `flufl.lock` is Copyright (C) 2007-2015 Barry Warsaw <barry at python.org>
- This file is part of flufl.lock.
+ Licensed under the terms of the GNU Lesser General Public License, version 3
+ or later. See the COPYING.LESSER file for details.
- flufl.lock 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, version 3 of the License.
- flufl.lock 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.
+ Project details
+ ===============
- You should have received a copy of the GNU Lesser General Public License
- along with flufl.lock. If not, see <http://www.gnu.org/licenses/>.
+ * Project home: https://gitlab.com/warsaw/flufl.lock
+ * Report bugs at: https://gitlab.com/warsaw/flufl.lock/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.lock.git
+ * Documentation: http://flufllock.readthedocs.org/
===================
NEWS for flufl.lock
===================
+ 2.4 (2015-10-10)
+ ================
+ * Drop Python 2.6 compatibility.
+ * Add Python 3.5 compatibility.
+
2.3.1 (2014-09-26)
==================
* Include MANIFEST.in in the sdist tarball, otherwise the Debian package
diff --git a/flufl/__init__.py b/flufl/__init__.py
index a8e1dfe..ecb8ba2 100644
--- a/flufl/__init__.py
+++ b/flufl/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
diff --git a/flufl/lock/NEWS.rst b/flufl/lock/NEWS.rst
index 347a579..7bd8a63 100644
--- a/flufl/lock/NEWS.rst
+++ b/flufl/lock/NEWS.rst
@@ -2,6 +2,11 @@
NEWS for flufl.lock
===================
+2.4 (2015-10-10)
+================
+ * Drop Python 2.6 compatibility.
+ * Add Python 3.5 compatibility.
+
2.3.1 (2014-09-26)
==================
* Include MANIFEST.in in the sdist tarball, otherwise the Debian package
diff --git a/flufl/lock/README.rst b/flufl/lock/README.rst
index 9af4dc7..0821c20 100644
--- a/flufl/lock/README.rst
+++ b/flufl/lock/README.rst
@@ -16,39 +16,26 @@ Documentation
=============
A `simple guide`_ to using the library is available within this package, in
-the form of doctests. The manual is also available online in the Cheeseshop
-at:
-
- http://package.python.org/flufl.lock
+the form of doctests.
Project details
===============
-The project home page is:
-
- http://launchpad.net/flufl.lock
-
-You should report bugs at:
-
- http://bugs.launchpad.net/flufl.lock
-
-You can download the latest version of the package either from the Cheeseshop:
-
- http://pypi.python.org/pypi/flufl.lock
-
-Of course you can also just install it with ``pip``::
+ * Project home: https://gitlab.com/warsaw/flufl.lock
+ * Report bugs at: https://gitlab.com/warsaw/flufl.lock/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.lock.git
+ * Documentation: http://flufllock.readthedocs.org/
- % sudo pip install flufl.lock
+You can install it with ``pip``::
-You may want to use `virtualenv`_ instead of installing the package into the
-system Python.
+ % pip install flufl.lock
You can grab the latest development copy of the code using git. The master
-repository is hosted on Gitorious. If you have git installed, you can grab
+repository is hosted on GitLab. If you have git installed, you can grab
your own branch of the code like this::
- $ git clone git://gitorious.org/flufl-lock/flufl-lock.git
+ $ git clone git at gitlab.com:warsaw/flufl.lock.git
You may contact the author via barry at python.org.
@@ -56,7 +43,7 @@ You may contact the author via barry at python.org.
Copyright
=========
-Copyright (C) 2004-2014 Barry A. Warsaw
+Copyright (C) 2004-2015 Barry A. Warsaw
This file is part of flufl.lock.
diff --git a/flufl/lock/__init__.py b/flufl/lock/__init__.py
index aa07930..78d7fcc 100644
--- a/flufl/lock/__init__.py
+++ b/flufl/lock/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock
#
@@ -29,7 +29,7 @@ __all__ = [
]
-__version__ = '2.3.1'
+__version__ = '2.4'
# Public API.
diff --git a/flufl/lock/_lockfile.py b/flufl/lock/_lockfile.py
index a28528e..fe59772 100644
--- a/flufl/lock/_lockfile.py
+++ b/flufl/lock/_lockfile.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2014 by Barry A. Warsaw
+# Copyright (C) 2007-2015 Barry A. Warsaw
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public License
@@ -20,14 +20,14 @@
This code implements an NFS-safe file-based locking algorithm influenced by
the GNU/Linux open(2) manpage, under the description of the O_EXCL option:
- [...] O_EXCL is broken on NFS file systems, programs which rely on it
- for performing locking tasks will contain a race condition. The
- solution for performing atomic file locking using a lockfile is to
- create a unique file on the same fs (e.g., incorporating hostname and
- pid), use link(2) to make a link to the lockfile. If link() returns
- 0, the lock is successful. Otherwise, use stat(2) on the unique file
- to check if its link count has increased to 2, in which case the lock
- is also successful.
+ [...] O_EXCL is broken on NFS file systems, programs which rely on it
+ for performing locking tasks will contain a race condition. The
+ solution for performing atomic file locking using a lockfile is to
+ create a unique file on the same fs (e.g., incorporating hostname and
+ pid), use link(2) to make a link to the lockfile. If link() returns
+ 0, the lock is successful. Otherwise, use stat(2) on the unique file
+ to check if its link count has increased to 2, in which case the lock
+ is also successful.
The assumption made here is that there will be no 'outside interference',
e.g. no agent external to this code will ever link() to the specific lock
@@ -98,7 +98,6 @@ except ImportError:
logging.getLogger('flufl.lock').addHandler(NullHandler())
-
# Exceptions that can be raised by this module
class LockError(Exception):
"""Base class for all exceptions in this module."""
@@ -113,7 +112,6 @@ class TimeOutError(LockError):
"""The timeout interval elapsed before the lock succeeded."""
-
class Lock:
"""A portable way to lock resources by way of the file system."""
def __init__(self, lockfile, lifetime=None):
diff --git a/flufl/lock/conf.py b/flufl/lock/conf.py
index bedccc7..3dccb44 100644
--- a/flufl/lock/conf.py
+++ b/flufl/lock/conf.py
@@ -39,7 +39,7 @@ master_doc = 'README'
# General information about the project.
project = 'flufl.lock'
-copyright = '2004-2014, Barry A. Warsaw'
+copyright = '2004-2015, Barry A. Warsaw'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/flufl/lock/tests/subproc.py b/flufl/lock/tests/subproc.py
index 80aed30..069ad1f 100644
--- a/flufl/lock/tests/subproc.py
+++ b/flufl/lock/tests/subproc.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
diff --git a/flufl/lock/tests/test_documentation.py b/flufl/lock/tests/test_documentation.py
index 0cc0922..9a5b507 100644
--- a/flufl/lock/tests/test_documentation.py
+++ b/flufl/lock/tests/test_documentation.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
@@ -51,7 +51,6 @@ DOCTEST_FLAGS = (
log_stream = StringIO()
-
def stop():
"""Call into pdb.set_trace()"""
# Do the import here so that you get the wacky special hacked pdb instead
@@ -60,7 +59,6 @@ def stop():
pdb.set_trace()
-
def make_temporary_lockfile(testobj):
"""Make a temporary lock file for the tests."""
def lockfile_creator():
@@ -110,7 +108,6 @@ def teardown(testobj):
pass
-
def additional_tests():
"Run the doc tests (README.rst and docs/*, if any exist)"
# Initialize logging for testing purposes.
diff --git a/flufl/lock/tests/test_lockfile.py b/flufl/lock/tests/test_lockfile.py
index d653655..7b7e23e 100644
--- a/flufl/lock/tests/test_lockfile.py
+++ b/flufl/lock/tests/test_lockfile.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
@@ -39,7 +39,6 @@ except ImportError:
from flufl.lock._lockfile import Lock, NotLockedError
-
class TestableEnvironmentError(EnvironmentError):
def __init__(self, errno):
super(TestableEnvironmentError, self).__init__()
@@ -49,7 +48,6 @@ EMOCKEDFAILURE = 99
EOTHERMOCKEDFAILURE = 98
-
class ErrnoRetryTests(unittest.TestCase):
def setUp(self):
self._builtin_open = builtins.open
diff --git a/setup.py b/setup.py
index b4fcec8..e640cbf 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
@@ -20,7 +20,7 @@ from setup_helpers import (
from setuptools import setup, find_packages
-require_python(0x20600f0)
+require_python(0x20700f0)
__version__ = get_version('flufl/lock/__init__.py')
diff --git a/setup_helpers.py b/setup_helpers.py
index d77fce7..f11bd7e 100644
--- a/setup_helpers.py
+++ b/setup_helpers.py
@@ -1,18 +1,18 @@
-# Copyright (C) 2009-2014 by Barry A. Warsaw
+# Copyright (C) 2009-2015 Barry A. Warsaw
#
-# This file is part of flufl.lock
+# This file is part of setup_helpers.py
#
-# flufl.lock 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, version 3 of the License.
+# setup_helpers.py 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, version 3 of the License.
#
-# flufl.lock is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# setup_helpers.py 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 flufl.lock. If not, see <http://www.gnu.org/licenses/>.
+# along with setup_helpers.py. If not, see <http://www.gnu.org/licenses/>.
"""setup.py helper functions."""
@@ -34,13 +34,13 @@ import re
import sys
-DEFAULT_VERSION_RE = re.compile(r'(?P<version>\d+\.\d+(?:\.\d+)?)')
+DEFAULT_VERSION_RE = re.compile(
+ r'(?P<version>\d+\.\d+(?:\.\d+)?(?:(?:a|b|rc)\d+)?)')
EMPTYSTRING = ''
-__version__ = '2.1'
+__version__ = '2.3'
-
def require_python(minimum):
"""Require at least a minimum Python version.
@@ -70,7 +70,6 @@ def require_python(minimum):
sys.exit(1)
-
def get_version(filename, pattern=None):
"""Extract the __version__ from a file without importing it.
@@ -104,7 +103,6 @@ def get_version(filename, pattern=None):
raise AssertionError('No __version__ assignment found')
-
def find_doctests(start='.', extension='.rst'):
"""Find separate-file doctests in the package.
@@ -127,7 +125,6 @@ def find_doctests(start='.', extension='.rst'):
return doctests
-
def long_description(*filenames):
"""Provide a long description."""
res = ['']
diff --git a/template.py b/template.py
index 2adb691..159607c 100644
--- a/template.py
+++ b/template.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 by Barry A. Warsaw
+# Copyright (C) 2015 Barry A. Warsaw
#
# This file is part of flufl.lock.
#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flufl.lock.git
More information about the Python-modules-commits
mailing list