Skip to content

Commit

Permalink
Merge branch 'master' of github.com:chrislit/abydos
Browse files Browse the repository at this point in the history
  • Loading branch information
chrislit committed Sep 29, 2018
2 parents 7d73393 + 15d9f96 commit 6d3f3a6
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ docs/_build/
*.pyc
*.log
.coverage
.idea/
notebooks/.ipynb_checkpoints
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "tests/regtests"]
path = tests/regression
url = https://github.com/chrislit/abydos-regtests.git
2 changes: 1 addition & 1 deletion abydos/phonetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5150,7 +5150,7 @@ def davidson(lname, fname='.', omit_fname=False):
"""
trans = {65: '', 69: '', 73: '', 79: '', 85: '', 72: '', 87: '', 89: ''}

lname = lname.upper()
lname = text_type(lname.upper())
code = _delete_consecutive_repeats(lname[:1] + lname[1:].translate(trans))
code = code[:4] + (4-len(code))*' '

Expand Down
16 changes: 8 additions & 8 deletions cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ rm -rf ./dist
rm -rf ./build
rm -rf ./.tox
rm -rf ./.mypy_cache
rm -rf ./docs/_build/*
rm -rf ./*.log
rm -rf ./.coverage
rm -rf */*.pyc
rm -rf */__pycache__
rm -rf *~
rm -rf .*~
rm -rf */*~
rm -rf */.*~

rm -rf ./docs/_build/*

find . -type f -name '*~' -delete
find . -type f -name '.*~' -delete
find . -type f -name '*.pyc' -delete
find . -type f -name '*.log' -delete
find . -type d -name '__pycache__' -delete
1 change: 1 addition & 0 deletions tests/regression
Submodule regression added at 7823af

0 comments on commit 6d3f3a6

Please sign in to comment.