PY2 no more, future no more

mpcabd · mpcabd · commit 08148eb5a7d5 · 2023-01-10T14:10:40.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,6 @@ install:
   - pip install -e .
 matrix:
   include:
-    - python: "2.7"
-      env:
-       - TOX_ENV=py27
     - python: "3.6"
       env:
         - TOX_ENV=py36
@@ -22,7 +19,10 @@ matrix:
     - python: "3.9"
       env:
         - TOX_ENV=py39
-    - python: "3.10-dev"
+    - python: "3.10"
       env:
         - TOX_ENV=py310
-script: tox -e $TOX_ENV
+    - python: "3.11"
+      env:
+        - TOX_ENV=py311
+script: tox -e $TOX_ENV
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 Reconstruct Arabic sentences to be used in applications that don't support
 Arabic script.
 
-Works with Python 2.x and 3.x
+Works with Python 3.x
 
 ## Description
 
@@ -248,6 +248,10 @@ https://github.com/mpcabd/python-arabic-reshaper/tarball/master
 
 ## Version History
 
+### 3.0.0
+* Stop supporting Python 2.7
+* Remove dependency on `future`. See #88.
+
 ### 2.1.4
 
 * Fix unparseable version bound for `fonttools` under Python 2
diff --git a/arabic_reshaper/__init__.py b/arabic_reshaper/__init__.py
@@ -9,4 +9,4 @@
                               ENABLE_ALL_LIGATURES)
 
 
-__version__ = '2.1.4'
+__version__ = '3.0.0'
diff --git a/arabic_reshaper/__version__.py b/arabic_reshaper/__version__.py
@@ -1 +1 @@
-__version__ = '2.1.4'
+__version__ = '3.0.0'
diff --git a/arabic_reshaper/arabic_reshaper.py b/arabic_reshaper/arabic_reshaper.py
@@ -7,8 +7,6 @@
 # Email: mpcabd@gmail.com
 # Website: http://mpcabd.xyz
 
-from __future__ import unicode_literals
-
 import re
 
 from itertools import repeat
@@ -52,7 +50,6 @@ class ArabicReshaper(object):
     Check these links for information on the configuration files format:
 
     * Python 3: https://docs.python.org/3/library/configparser.html
-    * Python 2: https://docs.python.org/2/library/configparser.html
 
     See the default configuration file :file:`default-config.ini` for details
     on how to configure your reshaper.
diff --git a/arabic_reshaper/letters.py b/arabic_reshaper/letters.py
@@ -13,8 +13,6 @@
 # <letter> should be in final form. If no replacement is specified for a form,
 # then no that means the letter doesn't support this form.
 
-from __future__ import unicode_literals
-
 UNSHAPED = 255
 ISOLATED = 0
 INITIAL = 1
diff --git a/arabic_reshaper/ligatures.py b/arabic_reshaper/ligatures.py
@@ -19,7 +19,6 @@
 #   3. Letters
 # This way we make sure we replace the longest ligatures first
 
-from __future__ import unicode_literals
 from itertools import chain
 
 SENTENCES_LIGATURES = (
diff --git a/arabic_reshaper/reshaper_config.py b/arabic_reshaper/reshaper_config.py
@@ -7,8 +7,6 @@
 # Email: mpcabd@gmail.com
 # Website: http://mpcabd.xyz
 
-from __future__ import unicode_literals
-
 import os
 
 from configparser import ConfigParser
diff --git a/arabic_reshaper/tests/test_001_initialization.py b/arabic_reshaper/tests/test_001_initialization.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unittest
 import arabic_reshaper
 import arabic_reshaper.ligatures
diff --git a/arabic_reshaper/tests/test_002_reshaping.py b/arabic_reshaper/tests/test_002_reshaping.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
-
 import unittest
 import sys
 import arabic_reshaper
diff --git a/arabic_reshaper/tests/test_003_reshaping.py b/arabic_reshaper/tests/test_003_reshaping.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
-
 import unittest
 import sys
 import arabic_reshaper
diff --git a/meta.yaml b/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "arabic-reshaper" %}
 {% set pypi_name = "arabic_reshaper" %}
-{% set version = "2.1.4" %}
+{% set version = "3.0.0" %}
 
 package:
   name: {{ name|lower }}
@@ -21,8 +21,6 @@ requirements:
     - pip
   run:
     - python
-    - configparser  # [py<3]
-    - future
 
 test:
   imports:
diff --git a/setup.py b/setup.py
@@ -6,45 +6,42 @@
 import io
 import os
 
-with io.open("README.md", "r", encoding="utf-8") as fh:
+with io.open('README.md', 'r', encoding='utf-8') as fh:
     long_description = fh.read()
 
 setup(
-    name="arabic_reshaper",
-    description=("Reconstruct Arabic sentences to be used in"
-                 " applications that don't support Arabic"),
+    name='arabic_reshaper',
+    description=('Reconstruct Arabic sentences to be used in'
+                 ' applications that do not support Arabic'),
     long_description=long_description,
-    long_description_content_type="text/markdown",
-    version='2.1.4',
-    platforms="ALL",
-    license="MIT",
+    long_description_content_type='text/markdown',
+    version='3.0.0',
+    platforms='ALL',
+    license='MIT',
     packages=['arabic_reshaper'],
-    install_requires=['configparser; python_version <"3"',
-                      'future'],
     extras_require={
-        'with-fonttools': ['fonttools>=4.0; python_version >="3"',
-                           'fonttools>=3.0,<4.0; python_version <"3"']
+        'with-fonttools': ['fonttools>=4.0']
     },
-    author="Abdullah Diab",
-    author_email="mpcabd@gmail.com",
-    maintainer="Abdullah Diab",
-    maintainer_email="mpcabd@gmail.com",
+    author='Abdullah Diab',
+    author_email='mpcabd@gmail.com',
+    maintainer='Abdullah Diab',
+    maintainer_email='mpcabd@gmail.com',
     package_dir={'arabic_reshaper': 'arabic_reshaper'},
     test_suite='arabic_reshaper.tests',
     include_package_data=True,
-    keywords="arabic shaping reshaping reshaper",
-    url="https://github.com/mpcabd/python-arabic-reshaper/",
-    download_url=("https://github.com/mpcabd/"
-                  "python-arabic-reshaper/tarball/master"),
+    keywords='arabic shaping reshaping reshaper',
+    url='https://github.com/mpcabd/python-arabic-reshaper/',
+    download_url=('https://github.com/mpcabd/'
+                  'python-arabic-reshaper/tarball/master'),
     classifiers=[
-        "Natural Language :: Arabic",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Topic :: Software Development :: Libraries :: Python Modules",
+        'Natural Language :: Arabic',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-envlist = py27,py36,py37,py38,py39,py310
+envlist = py36,py37,py38,py39,py310,py311
 
 [testenv]
 deps = pytest
 commands =
-    pytest
+    pytest
diff --git a/upload-to-anaconda.sh b/upload-to-anaconda.sh
@@ -7,9 +7,11 @@
 # conda-build . --python 3.8
 # conda-build . --python 3.9
 # conda-build . --python 3.10
+# conda-build . --python 3.11
 # anaconda login
 # anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py36_0.tar.bz2
 # anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py37_0.tar.bz2
 # anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py38_0.tar.bz2
 # anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py39_0.tar.bz2
 # anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py310_0.tar.bz2
+# anaconda upload --user mpcabd /opt/conda/conda-bld/noarch/arabic-reshaper-*-py311_0.tar.bz2

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@`
`9`	`9`	`ENABLE_ALL_LIGATURES)`
`10`	`10`
`11`	`11`
`12`		`-__version__ = '2.1.4'`
	`12`	`+__version__ = '3.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '2.1.4'`
	`1`	`+__version__ = '3.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`		`-`
`3`	`1`	`import unittest`
`4`	`2`	`import arabic_reshaper`
`5`	`3`	`import arabic_reshaper.ligatures`