Merge e5854c8 into 2b6b3ed

.circleci/config.yml

@@ -34,7 +34,7 @@ jobs:
             . venv/bin/activate
             echo "tox" >> requirements.txt
             pip install -r requirements.txt
-            pip install -r requirements-dev.txt
+            pip install -r requirements-test.txt
 
       - save_cache:
           paths:

.travis.yml

@@ -1,28 +1,35 @@
 language: python
 
+jobs:
+  include:
+    - os: linux
+      arch: arm64
+      python: 3.7
+    - os: linux
+      arch: ppc64le
+      python: 3.7
+    - os: osx
+      python: 3.6
+
+dist: xenial
 python:
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
-
-matrix:
-  include:
-    - python: 3.7
-      dist: xenial
-      sudo: true
+  - 3.7
+  - 3.8
 
 notifications:
   email: false
 
 # Install packages
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then travis_retry pip install pyliblzma; fi
-  - case "$TRAVIS_PYTHON_VERSION" in 3.5|3.6|3.7) travis_retry pip install cython;; esac
-  - case "$TRAVIS_PYTHON_VERSION" in 3.5|3.6|3.7) travis_retry pip install paq lzss;; esac
+  - if [[ $TRAVIS_PYTHON_VERSION != 2* ]]; then travis_retry pip install cython; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 2* ]]; then travis_retry pip install paq lzss; fi
   - travis_retry pip install coveralls
   - travis_retry pip install -r requirements.txt
-  - travis_retry pip install -r requirements-dev.txt
+  - travis_retry pip install -r requirements-test.txt
   - travis_retry python setup.py install
 
 # Run test

HISTORY.rst

@@ -1,15 +1,15 @@
 Release History
 ---------------
 
-0.4.1 (2019-07-00) *distant dietrich*
+0.4.1 (2020-01-07) *distant dietrich*
 +++++++++++++++++++++++++++++++++++++
 
-doi:
-
-Version 0.4.1 ...
+doi:10.5281/zenodo.3600548
 
 Changes:
 
+- Support for Python 3.4 was removed. (3.4 reached end-of-life on March 18,
+  2019)
 - Fuzzy intersections were corrected to avoid over-counting partial
   intersection instances.
 - Levenshtein can now return an optimal alignment

README.rst

@@ -71,19 +71,19 @@ Abydos
     :target: https://app.fossa.io/projects/git%2Bgithub.com%2Fchrislit%2Fabydos?ref=badge_shield
     :alt: FOSSA Status
 
-.. |pylint| image:: https://img.shields.io/badge/Pylint-8.87/10-yellowgreen.svg
+.. |pylint| image:: https://img.shields.io/badge/Pylint-9.0/10-yellowgreen.svg
     :target: #
     :alt: Pylint Score
 
-.. |flake8| image:: https://img.shields.io/badge/flake8-1-green.svg
+.. |flake8| image:: https://img.shields.io/badge/flake8-0-brightgreen.svg
     :target: #
     :alt: flake8 Errors
 
 .. |pydocstyle| image:: https://img.shields.io/badge/pydocstyle-0-brightgreen.svg
     :target: #
     :alt: pydocstyle Errors
 
-.. |sloccount| image:: https://img.shields.io/badge/SLOCCount-42,187-blue.svg
+.. |sloccount| image:: https://img.shields.io/badge/SLOCCount-43,113-blue.svg
     :target: #
     :alt: SLOCCount
 
@@ -107,8 +107,8 @@ Abydos
     :target: https://libraries.io/pypi/abydos
     :alt: Libraries.io SourceRank
 
-.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3235034.svg
-    :target: https://doi.org/10.5281/zenodo.3235034
+.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3600548
+    :target: https://doi.org/10.5281/zenodo.3600548
     :alt: Zenodo
 
 .. |cii| image:: https://bestpractices.coreinfrastructure.org/projects/1598/badge
@@ -164,7 +164,7 @@ Abydos
 
 |
 | `Abydos NLP/IR library <https://github.com/chrislit/abydos>`_
-| Copyright 2014-2019 by Christopher C. Little
+| Copyright 2014-2020 by Christopher C. Little
 
 Abydos is a library of phonetic algorithms, string distance measures & metrics,
 stemmers, and string fingerprinters including:
@@ -315,7 +315,7 @@ To install from `conda-forge <https://anaconda.org/conda-forge/abydos>`_::
 
    conda install abydos
 
-It should run on Python 2.7 and Python 3.5-3.7.
+It should run on Python 2.7 and Python 3.5-3.8.
 
 Testing & Contributing
 ======================
@@ -324,10 +324,10 @@ To run the whole test-suite just call tox::
 
     tox
 
-The tox setup has the following environments: black, py36, py27, doctest,
-py36-regression, py27-regression, py36-fuzz, py27-fuzz, pylint, pycodestyle,
-pydocstyle, flake8, doc8, badges, docs, & dist. So if you only want to generate
-documentation (in HTML, EPUB, & PDF formats), just call::
+The tox setup has the following environments: black, py37, py27, doctest,
+py37-regression, py27-regression, py37-fuzz, py27-fuzz, pylint, pydocstyle,
+flake8, doc8, docs, sloccount, badges, & build. So if you only want to
+generate documentation (in HTML, EPUB, & PDF formats), just call::
 
     tox -e docs
 

abydos/distance/_token_distance.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2018-2019 by Christopher C. Little.
+# Copyright 2018-2020 by Christopher C. Little.
 # This file is part of Abydos.
 #
 # Abydos is free software: you can redistribute it and/or modify

abydos/fingerprint/_extract.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2019 by Christopher C. Little.
+# Copyright 2019-2020 by Christopher C. Little.
 # This file is part of Abydos.
 #
 # Abydos is free software: you can redistribute it and/or modify

abydos/phones/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2014-2018 by Christopher C. Little.
+# Copyright 2014-2020 by Christopher C. Little.
 # This file is part of Abydos.
 #
 # Abydos is free software: you can redistribute it and/or modify

abydos/phones/_phones.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2014-2019 by Christopher C. Little.
+# Copyright 2014-2020 by Christopher C. Little.
 # This file is part of Abydos.
 #
 # Abydos is free software: you can redistribute it and/or modify

azure-pipelines.yml

@@ -5,113 +5,102 @@
 
 jobs:
 
-- job: 'Test_Linux'
-  pool:
-    vmImage: 'ubuntu-16.04'
+- job: 'Test'
+
   strategy:
     matrix:
-      Python27:
+      Python27Linux:
         python.version: '2.7'
-      Python35:
+        imageName: 'ubuntu-latest'
+        architecture: 'x64'
+      Python35Linux:
         python.version: '3.5'
-      Python36:
+        imageName: 'ubuntu-latest'
+        architecture: 'x64'
+      Python36Linux:
         python.version: '3.6'
-      Python37:
+        imageName: 'ubuntu-latest'
+        architecture: 'x64'
+      Python37Linux:
         python.version: '3.7'
-    maxParallel: 4
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '$(python.version)'
-      architecture: 'x64'
-
-  - script: python -m pip install --upgrade pip && pip install -r requirements.txt && pip install -r requirements-dev.txt
-    displayName: 'Install dependencies'
-
-  - script: |
-      pip install pytest
-      pip install pytest-cov
-      pytest tests --doctest-modules --junitxml=junit/test-results.xml --cov=abydos --cov-report=xml --cov-report=html
-    displayName: 'pytest'
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
-
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: Cobertura
-      summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
-      reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
-
-- job: 'Test_Windows'
-  pool:
-    vmImage: 'vs2017-win2016'
-  strategy:
-    matrix:
-      Python27:
+        imageName: 'ubuntu-latest'
+        architecture: 'x64'
+      Python38Linux:
+        python.version: '3.8'
+        imageName: 'ubuntu-latest'
+        architecture: 'x64'
+      Python27Windows:
         python.version: '2.7'
-      Python35:
+        imageName: 'windows-latest'
+        architecture: 'x64'
+      Python35Windows:
         python.version: '3.5'
-      Python36:
+        imageName: 'windows-latest'
+        architecture: 'x64'
+      Python36Windows:
         python.version: '3.6'
-      Python37:
+        imageName: 'windows-latest'
+        architecture: 'x64'
+      Python37Windows:
         python.version: '3.7'
-    maxParallel: 4
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '$(python.version)'
-      architecture: 'x64'
-
-  - script: python -m pip install --upgrade pip && pip install -r requirements.txt && pip install -r requirements-dev.txt
-    displayName: 'Install dependencies'
-
-  - script: |
-      pip install pytest
-      pip install pytest-cov
-      pytest tests --doctest-modules --junitxml=junit/test-results.xml --cov=abydos --cov-report=xml --cov-report=html
-    displayName: 'pytest'
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
-
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: Cobertura
-      summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
-      reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
-
-
-- job: 'Test_MacOS'
-  pool:
-    vmImage: 'macOS-10.13'
-  strategy:
-    matrix:
-      Python27:
+        imageName: 'windows-latest'
+        architecture: 'x64'
+      Python38Windows:
+        python.version: '3.8'
+        imageName: 'windows-latest'
+        architecture: 'x64'
+      Python27Windowsx86:
+        python.version: '2.7'
+        imageName: 'windows-latest'
+        architecture: 'x86'
+      Python35Windowsx86:
+        python.version: '3.5'
+        imageName: 'windows-latest'
+        architecture: 'x86'
+      Python36Windowsx86:
+        python.version: '3.6'
+        imageName: 'windows-latest'
+        architecture: 'x86'
+      Python37Windowsx86:
+        python.version: '3.7'
+        imageName: 'windows-latest'
+        architecture: 'x86'
+      Python38Windowsx86:
+        python.version: '3.8'
+        imageName: 'windows-latest'
+        architecture: 'x86'
+      Python27MacOS:
         python.version: '2.7'
-      Python35:
+        imageName: 'macOS-latest'
+        architecture: 'x64'
+      Python35MacOS:
         python.version: '3.5'
-      Python36:
+        imageName: 'macOS-latest'
+        architecture: 'x64'
+      Python36MacOS:
         python.version: '3.6'
-      Python37:
+        imageName: 'macOS-latest'
+        architecture: 'x64'
+      Python37MacOS:
         python.version: '3.7'
-    maxParallel: 4
+        imageName: 'macOS-latest'
+        architecture: 'x64'
+      Python38MacOS:
+        python.version: '3.8'
+        imageName: 'macOS-latest'
+        architecture: 'x64'
+    maxParallel: 10
+
+  pool:
+    vmImage: $(imageName)
 
   steps:
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '$(python.version)'
-      architecture: 'x64'
+      architecture: '$(architecture)'
 
-  - script: python -m pip install --upgrade pip && pip install -r requirements.txt  && pip install -r requirements-dev.txt
+  - script: python -m pip install --upgrade pip && pip install -r requirements.txt && pip install -r requirements-test.txt
     displayName: 'Install dependencies'
 
   - script: |
@@ -131,17 +120,3 @@ jobs:
       codeCoverageTool: Cobertura
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
       reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
-
-- job: 'Publish'
-  dependsOn: 'Test_Linux'
-  pool:
-    vmImage: 'Ubuntu 16.04'
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.x'
-      architecture: 'x64'
-
-  - script: python setup.py sdist
-    displayName: 'Build sdist'

pyproject.toml

@@ -58,7 +58,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "~2.7 || ^3.4"
+python = "~2.7 || ^3.5"
 
 numpy = ">=1.7"
 six = ">=1.3"

requirements-test.txt

@@ -0,0 +1,5 @@
+# Library dependencies for the Python code.  You need to install these with
+# `pip install -r requirements-test.txt` before you can run this.
+
+nltk
+syllabipy