Drop support for Python 2.6, 3.2 and 3.3

BoboTiG · BoboTiG · commit 152d3f8800f9 · 2018-09-18T14:04:25.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 language: python
 
 python:
-  - 2.6
   - 2.7
-  - 3.2
-  - 3.3
   - 3.4
   - 3.5
   - 3.6
@@ -16,13 +13,7 @@ before_install:
   - SED_GET_PY='s/[^0-9]//g;s/.//3g;2s/.*/py/;1!G;h;$!d;s/y.2./y/;s/y.3./y3/'
   - PY=$(python -V 2>&1 | sed "$SED_GET_PY")
   - export TOXENV=py$PY
-  # On Travis CI environments for Python 2.6 and 3.2, pip is broken
-  - GET_PIP_URL=https://bootstrap.pypa.io/${PY::1}.${PY:1}/get-pip.py
-  - if [[ "26 32" =~ $PY ]] ; then python <(curl -fsSL "$GET_PIP_URL") ; fi
-  - DEPS_TABLE=([26]='virtualenv<16 tox<3'
-                [32]='virtualenv<14 tox<3'
-                [33]='virtualenv<15.2 tox<3')
-  - DEPS=${DEPS_TABLE[$PY]:-'tox'}
+  - DEPS=tox
 
 install:
   - pip install --upgrade $DEPS
diff --git a/AUTHORS b/AUTHORS
@@ -18,6 +18,7 @@ Lukáš Lalinský <lalinsky@gmail.com>
 Malthe Borch <mborch@gmail.com>
 Martin Kreichgauer <kreichgauer@gmail.com>
 Martin Kreichgauer <martin@kreichgauer.com>
+Mickaël Schoentgen <mschoentgen@nuxeo.com>
 Mike Lundy <mike@fluffypenguin.org>
 Raymond Hettinger <python@rcn.com>
 Roman Ovchinnikov <coolthecold@gmail.com>
diff --git a/README.rst b/README.rst
@@ -2,6 +2,7 @@ Watchdog
 ========
 Python API and shell utilities to monitor file system events.
 
+Works on Python 2.7 and 3.4+. If you want to use an old version of Python, you should stick with watchdog < 0.10.0.
 
 Example API Usage
 -----------------
@@ -117,7 +118,7 @@ Installing from PyPI using ``pip``:
     
 .. code-block:: bash
 
-    $ pip install watchdog
+    $ python -m pip install watchdog
 
 Installing from PyPI using ``easy_install``:
     
@@ -210,9 +211,8 @@ this feature.
 
 Dependencies
 ------------
-1. Python 2.6 or above.
+1. Python 2.7, 3.4 or above.
 2. pathtools_
-3. select_backport_ (select.kqueue replacement for 2.6 on BSD/Mac OS X)
 4. XCode_ (only on Mac OS X)
 5. PyYAML_ (only for ``watchmedo`` script)
 6. argh_ (only for ``watchmedo`` script)
@@ -257,7 +257,6 @@ to do:
 .. _issue tracker: http://github.com/gorakhargosh/watchdog/issues
 
 .. _homebrew: http://mxcl.github.com/homebrew/
-.. _select_backport: http://pypi.python.org/pypi/select_backport
 .. _argh: http://pypi.python.org/pypi/argh
 .. _PyYAML: http://www.pyyaml.org/
 .. _XCode: http://developer.apple.com/technologies/tools/xcode.html
diff --git a/changelog.rst b/changelog.rst
@@ -3,6 +3,12 @@
 API changes
 -----------
 
+0.10.0
+~~~~~~
+
+- Dropped support for Python 2.6, 3.2 and 3.3.
+  If you are still running one of these obsolete Python version, you have to keep using watchdog < 0.10.0.
+
 0.8.2
 ~~~~~
 
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: python-watchdog
 Section: free
 Priority: extra
 Maintainer: Hannu Valtonen <hannu.valtonen@ohmu.fi>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), python-support, python (>= 2.6), python-setuptools (>= 0.6.14 )
+Build-Depends: cdbs, debhelper (>= 7.0.50~), python-support, python (>= 2.7), python-setuptools (>= 0.6.14 )
 Standards-Version: 3.8.4
 
 Package: python-watchdog
diff --git a/debian/pyversions b/debian/pyversions
@@ -1 +1 @@
-2.6
+2.7
diff --git a/docs/source/global.rst.inc b/docs/source/global.rst.inc
@@ -38,7 +38,6 @@
 .. _Python: http://python.org
 .. _pywin32: http://sourceforge.net/projects/pywin32/
 .. _PyYAML: http://www.pyyaml.org/
-.. _select_backport: http://pypi.python.org/pypi/select_backport/
 .. _sphinx: http://sphinx.pocoo.org/
 .. _treewalker: http://github.com/jbd/treewatcher
 .. _unison fsmonitor: https://webdav.seas.upenn.edu/viewvc/unison/trunk/src/fsmonitor.py?view=markup&pathrev=471
diff --git a/docs/source/hacking.rst b/docs/source/hacking.rst
@@ -22,7 +22,6 @@ beginning to hack:
 2. git_
 3. ssh
 4. XCode_ (on Mac OS X)
-5. select_backport_ (on BSD/Mac OS X if you're using Python 2.6)
 
 Setting up the Work Environment
 -------------------------------
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -11,6 +11,8 @@ Watchdog
 
 Python API library and shell utilities to monitor file system events.
 
+Works on Python 2.7 and 3.4+. If you want to use an old version of Python, you should stick with watchdog < 0.10.0.
+
 Directory monitoring made easy with
 -----------------------------------
 
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -4,7 +4,7 @@
 
 Installation
 ============
-|project_name| requires Python 2.6 or above to work. If you are using a
+|project_name| requires Python 2.7 or 3.4+ to work. If you are using a
 Linux/FreeBSD/Mac OS X system, you already have Python installed. However,
 you may wish to upgrade your system to Python 2.7 at least, because this
 version comes with updates that can reduce compatibility
@@ -56,9 +56,6 @@ using.
 +---------------------+-------------+-------------+-------------+-------------+
 | argparse_           |     Yes     |     Yes     |     Yes     |     Yes     |
 +---------------------+-------------+-------------+-------------+-------------+
-| select_backport_    |             |             |     Yes     |     Yes     |
-| (Python 2.6)        |             |             |             |             |
-+---------------------+-------------+-------------+-------------+-------------+
 | pathtools_          |     Yes     |     Yes     |     Yes     |     Yes     |
 +---------------------+-------------+-------------+-------------+-------------+
 
diff --git a/setup.py b/setup.py
@@ -85,23 +85,12 @@ def run_tests(self):
         sys.exit(errno)
 
 tests_require=['pytest', 'pytest-cov', 'pytest-timeout >=0.3']
-if sys.version_info < (2, 7, 0):
-    tests_require.append('unittest2')
 
 install_requires = [
-    "PyYAML<3.13" if sys.version_info[:2] == (3, 2) else "PyYAML>=3.10",
+    "PyYAML>=3.10",
     "argh>=0.24.1",
     "pathtools>=0.1.1",
 ]
-if sys.version_info < (2, 7, 0):
-    # argparse is merged into Python 2.7 in the Python 2x series
-    # and Python 3.2 in the Python 3x series.
-    install_requires.append('argparse >=1.1')
-    if any([key in sys.platform for key in ['bsd', 'darwin']]):
-        # Python 2.6 and below have the broken/non-existent kqueue implementations
-        # in the select module. This backported patch adds one from Python 2.7,
-        # which works.
-        install_requires.append('select_backport >=0.2')
 
 with open('README.rst') as f:
     readme = f.read()
@@ -142,11 +131,8 @@ def run_tests(self):
           'Operating System :: Microsoft :: Windows :: Windows NT/2000',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2.6',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.2',
-          'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
diff --git a/src/watchdog/observers/kqueue.py b/src/watchdog/observers/kqueue.py
@@ -30,17 +30,6 @@
              only those directories which report changes and do a diff
              between two sub-DirectorySnapshots perhaps.
 
-.. ADMONITION:: About ``select.kqueue`` and Python versions
-
-    * Python 2.5 does not ship with ``select.kqueue``
-    * Python 2.6 ships with a broken ``select.kqueue`` that cannot take
-      multiple events in the event list passed to ``kqueue.control``.
-    * Python 2.7 ships with a working ``select.kqueue``
-      implementation.
-
-    I have backported the Python 2.7 implementation to Python 2.5 and 2.6
-    in the ``select_backport`` package available on PyPI.
-
 .. ADMONITION:: About OS X performance guidelines
 
     Quote from the `Mac OS X File System Performance Guidelines`_:
@@ -85,14 +74,7 @@
 import sys
 import stat
 import os
-
-# See the notes for this module in the documentation above ^.
-#import select
-# if not has_attribute(select, 'kqueue') or sys.version_info < (2, 7, 0):
-if sys.version_info < (2, 7, 0):
-    import select_backport as select
-else:
-    import select
+import select
 
 from pathtools.path import absolute_path
 
diff --git a/src/watchdog/observers/winapi.py b/src/watchdog/observers/winapi.py
@@ -41,11 +41,7 @@
 import ctypes.wintypes
 from functools import reduce
 
-try:
-    LPVOID = ctypes.wintypes.LPVOID
-except AttributeError:
-    # LPVOID wasn't defined in Py2.5, guess it was introduced in Py2.6
-    LPVOID = ctypes.c_void_p
+LPVOID = ctypes.wintypes.LPVOID
 
 # Invalid handle value.
 INVALID_HANDLE_VALUE = ctypes.c_void_p(-1).value
diff --git a/src/watchdog/utils/bricks.py b/src/watchdog/utils/bricks.py
@@ -173,81 +173,79 @@ def _get(self):
         return item
 
 
-if sys.version_info >= (2, 6, 0):
-    KEY, PREV, NEXT = list(range(3))
+KEY, PREV, NEXT = list(range(3))
 
-    class OrderedSet(MutableSet):
+class OrderedSet(MutableSet):
 
-        """
-        Implementation based on a doubly-linked link and an internal dictionary.
-        This design gives :class:`OrderedSet` the same big-Oh running times as
-        regular sets including O(1) adds, removes, and lookups as well as
-        O(n) iteration.
-
-        .. ADMONITION:: Implementation notes
-
-                Runs on Python 2.6 or later (and runs on Python 3.0 or later
-                without any modifications).
-
-        :author: python@rcn.com (Raymond Hettinger)
-        :url: http://code.activestate.com/recipes/576694/
-        """
+    """
+    Implementation based on a doubly-linked link and an internal dictionary.
+    This design gives :class:`OrderedSet` the same big-Oh running times as
+    regular sets including O(1) adds, removes, and lookups as well as
+    O(n) iteration.
 
-        def __init__(self, iterable=None):
-            self.end = end = []
-            end += [None, end, end]         # sentinel node for doubly linked list
-            self.map = {}                   # key --> [key, prev, next]
-            if iterable is not None:
-                self |= iterable
+    .. ADMONITION:: Implementation notes
 
-        def __len__(self):
-            return len(self.map)
+            Runs on Python 2.7 or later.
 
-        def __contains__(self, key):
-            return key in self.map
+    :author: python@rcn.com (Raymond Hettinger)
+    :url: http://code.activestate.com/recipes/576694/
+    """
 
-        def add(self, key):
-            if key not in self.map:
-                end = self.end
-                curr = end[PREV]
-                curr[NEXT] = end[PREV] = self.map[key] = [key, curr, end]
+    def __init__(self, iterable=None):
+        self.end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.map = {}                   # key --> [key, prev, next]
+        if iterable is not None:
+            self |= iterable
 
-        def discard(self, key):
-            if key in self.map:
-                key, prev, _next = self.map.pop(key)
-                prev[NEXT] = _next
-                _next[PREV] = prev
+    def __len__(self):
+        return len(self.map)
 
-        def __iter__(self):
-            end = self.end
-            curr = end[NEXT]
-            while curr is not end:
-                yield curr[KEY]
-                curr = curr[NEXT]
+    def __contains__(self, key):
+        return key in self.map
 
-        def __reversed__(self):
+    def add(self, key):
+        if key not in self.map:
             end = self.end
             curr = end[PREV]
-            while curr is not end:
-                yield curr[KEY]
-                curr = curr[PREV]
-
-        def pop(self, last=True):
-            if not self:
-                raise KeyError('set is empty')
-            key = next(reversed(self)) if last else next(iter(self))
-            self.discard(key)
-            return key
-
-        def __repr__(self):
-            if not self:
-                return '%s()' % (self.__class__.__name__,)
-            return '%s(%r)' % (self.__class__.__name__, list(self))
-
-        def __eq__(self, other):
-            if isinstance(other, OrderedSet):
-                return len(self) == len(other) and list(self) == list(other)
-            return set(self) == set(other)
-
-        def __del__(self):
-            self.clear()                    # remove circular references
+            curr[NEXT] = end[PREV] = self.map[key] = [key, curr, end]
+
+    def discard(self, key):
+        if key in self.map:
+            key, prev, _next = self.map.pop(key)
+            prev[NEXT] = _next
+            _next[PREV] = prev
+
+    def __iter__(self):
+        end = self.end
+        curr = end[NEXT]
+        while curr is not end:
+            yield curr[KEY]
+            curr = curr[NEXT]
+
+    def __reversed__(self):
+        end = self.end
+        curr = end[PREV]
+        while curr is not end:
+            yield curr[KEY]
+            curr = curr[PREV]
+
+    def pop(self, last=True):
+        if not self:
+            raise KeyError('set is empty')
+        key = next(reversed(self)) if last else next(iter(self))
+        self.discard(key)
+        return key
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, list(self))
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedSet):
+            return len(self) == len(other) and list(self) == list(other)
+        return set(self) == set(other)
+
+    def __del__(self):
+        self.clear()  # remove circular references
diff --git a/src/watchdog/utils/compat.py b/src/watchdog/utils/compat.py
@@ -23,7 +23,4 @@
     import Queue as queue
 
 
-if sys.version_info < (2, 7):
-    from watchdog.utils.event_backport import Event
-else:
-    from threading import Event
+from threading import Event
diff --git a/src/watchdog/utils/event_backport.py b/src/watchdog/utils/event_backport.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tools/multi-bootstrap b/tools/multi-bootstrap
diff --git a/tox.ini b/tox.ini

-Original file line number
+Diff line change
 Malthe Borch <[email protected]>
 Martin Kreichgauer <[email protected]>
 Martin Kreichgauer <[email protected]>
 +Mickaël Schoentgen <[email protected]>
 Mike Lundy <[email protected]>
 Raymond Hettinger <[email protected]>
 Roman Ovchinnikov <[email protected]>