Merge 735e809 into 84c7b7f

petl-developers · Aug 28, 2021 · 0e2e222 · 0e2e222
2 parents 84c7b7f + 735e809
commit 0e2e222
Show file tree

Hide file tree

Showing 172 changed files with 818 additions and 1,743 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,3 @@
 [report]
 exclude_lines =
     pragma: no cover
-    pragma: ${PY_MAJOR_VERSION} no cover
diff --git a/.github/workflows/test-changes.yml b/.github/workflows/test-changes.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest", "windows-latest", "macos-latest" ]
-        python: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python: [3.6, 3.7, 3.8, 3.9]
 
     runs-on: "${{ matrix.os }}"
 

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 #Fri Jun 22 10:55:09 BST 2012
 eclipse.preferences.version=1
 encoding//docs/conf.py=utf-8
-encoding//src/petl/compat.py=utf-8
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ jobs:
   - python: 3.7
   - python: 3.8
   - python: 3.9
-  - python: 2.7
   # - python: pypy3
 before_install:
 - sudo apt-get -qq update

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,10 +12,6 @@ environment:
 
   matrix:
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      DISTUTILS_USE_SDK: "1"
-
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6"
 

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,12 @@
 Changes
 =======
 
+Unreleaesed
+-------------
+
+* Drop support for EOL Python 2.7.
+  By :user:`hugovk`, :issue:`478`.
+
 Version 1.7.4
 -------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # petl documentation build configuration file, created by
 # sphinx-quickstart on Fri Aug 19 11:16:43 2011.
@@ -47,8 +46,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'petl'
-copyright = u'2014, Alistair Miles'
+project = 'petl'
+copyright = '2014, Alistair Miles'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -185,8 +184,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'petl.tex', u'petl Documentation',
-   u'Alistair Miles', 'manual'),
+  ('index', 'petl.tex', 'petl Documentation',
+   'Alistair Miles', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -218,8 +217,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'petl', u'petl Documentation',
-     [u'Alistair Miles'], 1)
+    ('index', 'petl', 'petl Documentation',
+     ['Alistair Miles'], 1)
 ]
 
 

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -29,7 +29,7 @@ suite with::
     $ pip install nose
     $ nosetests -v
 
-Currently :mod:`petl` supports Python 2.7, 3.4, 3.5 and 3.6
+Currently :mod:`petl` supports Python 3.6+
 so the tests should pass under all these Python versions.
 
 Dependencies
@@ -85,12 +85,12 @@ Automatically running all tests
 
 All of the above tests can be run automatically using `tox
 <https://tox.readthedocs.org/>`_. You will need binaries for Python
-2.7 and 3.6 available on your system.
+3.6 available on your system.
 
 To run all tests **without** installing any of the optional
 dependencies, do::
 
-    $ tox -e py27,py36,docs
+    $ tox -e py36,docs
 
 To run the entire test suite, including installation of **all**
 optional dependencies, do::

diff --git a/docs/intro.rst b/docs/intro.rst
@@ -21,7 +21,7 @@ To verify the installation, the test suite can be run with `nose
     $ pip install nose
     $ nosetests -v petl
 
-:mod:`petl` has been tested with Python versions 2.7 and 3.4-3.6 
+:mod:`petl` has been tested with Python versions 3.6+
 under Linux and Windows operating systems.
 
 .. _intro_dependencies:

diff --git a/examples/comparison.py b/examples/comparison.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 import petl as etl
 table = [['foo', 'bar'],
          ['a', 1],

diff --git a/examples/intro.py b/examples/intro.py
@@ -1,5 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
 example_data = """foo,bar,baz
 a,1,3.4
 b,2,7.4

diff --git a/examples/io/csv.py b/examples/io/csv.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # fromcsv()
 ###########
 

diff --git a/examples/io/html.py b/examples/io/html.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # tohtml()
 ##########
 

diff --git a/examples/io/json.py b/examples/io/json.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # fromjson()
 ############
 

diff --git a/examples/io/numpy.py b/examples/io/numpy.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # toarray()
 ###########
 

diff --git a/examples/io/pandas.py b/examples/io/pandas.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # todataframe()
 ###############
 

diff --git a/examples/io/pickle.py b/examples/io/pickle.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # frompickle()
 ##############
 

diff --git a/examples/io/pytables.py b/examples/io/pytables.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
-
-
 # fromhdf5()
 ############
 

diff --git a/examples/io/sqlite3.py b/examples/io/sqlite3.py
@@ -1,4 +1,3 @@
-from __future__ import division, print_function, absolute_import
 import os
 
 

diff --git a/examples/io/text.py b/examples/io/text.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # fromtext()
 ############
 

diff --git a/examples/io/whoosh.py b/examples/io/whoosh.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
-
-
 # fromtextindex()
 #################
 
@@ -17,10 +13,10 @@
 
 index = create_in(dirname, schema)
 writer = index.writer()
-writer.add_document(title=u"First document", path=u"/a",
-                    content=u"This is the first document we've added!")
-writer.add_document(title=u"Second document", path=u"/b",
-                    content=u"The second one is even more interesting!")
+writer.add_document(title="First document", path="/a",
+                    content="This is the first document we've added!")
+writer.add_document(title="Second document", path="/b",
+                    content="The second one is even more interesting!")
 writer.commit()
 # extract documents as a table
 table = etl.fromtextindex(dirname)
@@ -68,11 +64,11 @@
 
 index = create_in('example.whoosh', schema)
 writer = index.writer()
-writer.add_document(title=u"Oranges", path=u"/a",
-                    content=u"This is the first document we've added!")
-writer.add_document(title=u"Apples", path=u"/b",
-                    content=u"The second document is even more "
-                            u"interesting!")
+writer.add_document(title="Oranges", path="/a",
+                    content="This is the first document we've added!")
+writer.add_document(title="Apples", path="/b",
+                    content="The second document is even more "
+                            "interesting!")
 writer.commit()
 # demonstrate the use of searchtextindex()
 table1 = etl.searchtextindex('example.whoosh', 'oranges')

diff --git a/examples/io/xml.py b/examples/io/xml.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 import petl as etl
 # setup a file to demonstrate with
 d = '''<table>

diff --git a/examples/transform/basics.py b/examples/transform/basics.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # cut()
 #######
 
@@ -54,7 +51,7 @@
 table4 = [['foo', 'bar', 'baz'],
           ['A', 1, 2],
           ['B', '2', '3.4'],
-          [u'B', u'3', u'7.8', True],
+          ['B', '3', '7.8', True],
           ['D', 'xyz', 9.0],
           ['E', None]]
 table5 = etl.cat(table4)

diff --git a/examples/transform/conversions.py b/examples/transform/conversions.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # convert()
 ###########
 

diff --git a/examples/transform/dedup.py b/examples/transform/dedup.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # duplicates()
 ##############
 
@@ -28,7 +25,7 @@
           ['A', 1, 2],
           ['B', '2', '3.4'],
           ['D', 'xyz', 9.0],
-          ['B', u'3', u'7.8'],
+          ['B', '3', '7.8'],
           ['B', '2', 42],
           ['E', None, None],
           ['D', 4, 12.3],

diff --git a/examples/transform/fills.py b/examples/transform/fills.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # filldown()
 ############
 

diff --git a/examples/transform/headers.py b/examples/transform/headers.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # rename()
 ##########
 

diff --git a/examples/transform/intervals.py b/examples/transform/intervals.py
@@ -1,6 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
-
 # intervallookup()
 ##################
 

diff --git a/examples/transform/joins.py b/examples/transform/joins.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # join()
 ########
 

diff --git a/examples/transform/maps.py b/examples/transform/maps.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # fieldmap()
 ############
 

diff --git a/examples/transform/reductions.py b/examples/transform/reductions.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # rowreduce()
 #############
 

diff --git a/examples/transform/regex.py b/examples/transform/regex.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # capture()
 ############
 

diff --git a/examples/transform/reshape.py b/examples/transform/reshape.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # melt()
 ########
 

diff --git a/examples/transform/selects.py b/examples/transform/selects.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # select()
 ##########
 

diff --git a/examples/transform/setops.py b/examples/transform/setops.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # complement()
 ##############
 

diff --git a/examples/transform/sorts.py b/examples/transform/sorts.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # sort()
 ########
 

diff --git a/examples/transform/unpacks.py b/examples/transform/unpacks.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
-
 # unpack()
 ##########
 

diff --git a/examples/transform/validation.py b/examples/transform/validation.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, division
-
-
 # validate()
 ############
 

diff --git a/examples/util/base.py b/examples/util/base.py
@@ -1,7 +1,3 @@
-from __future__ import division, print_function, absolute_import, \
-    unicode_literals
-
-
 # values()
 ##########