Skip to content

Commit

Permalink
Prepare for release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ken Kundert authored and Ken Kundert committed Jul 21, 2020
1 parent 50cf29e commit a710e14
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: python
install:
- pip install .
- pip install coveralls hypothesis
- pip install coveralls hypothesis difflib
script:
- ./test --coverage
- coverage run -m py.test
Expand All @@ -16,5 +15,6 @@ jobs:
- python: 3.8
- python: nightly
allow_failures:
- python: 3.5
- python: nightly
fast_finish: true
2 changes: 2 additions & 0 deletions doc/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ Releases
| Version: 1.20.5
| Released: 2020-05-26
**1.21 (2020-07-20)**:
- Allow :class:`inform.ProgressBar` output to be suppressed.
- Allow ``/`` to be overridden in :class:`inform.plural`
- Various enhancements to :func:`inform.conjoin` and :func:`inform.full_stop`.
- Added :func:`inform.parse_range` and :func:`inform.format_range` functions.

**1.20 (2020-01-08)**:
- Add *format* method to :class:`inform.plural`.
Expand Down
3 changes: 2 additions & 1 deletion doc/user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,7 @@ user-inputted strings.
>>> parse_range('1-3,5')
{1, 2, 3, 5}
.. _format_range desc:

format_range
Expand All @@ -1416,6 +1417,7 @@ representing a set of numbers.
>>> format_range({1, 2, 3, 5})
'1-3,5'
.. _progressbar desc:

ProgressBar Class
Expand Down Expand Up @@ -1446,7 +1448,6 @@ example:
>>> display('Processed:', conjoin(processed), end='.\n')
Processed: i1, i2, i3, i4, i5, i6, i7, i8, i9 and i10.
The second is similar to the first, except you just give an integer to indicate
how many iterations you wish:

Expand Down
4 changes: 3 additions & 1 deletion inform/inform.py
Original file line number Diff line number Diff line change
Expand Up @@ -850,9 +850,11 @@ def conjoin(iterable, conj=' and ', sep=', ', end='', fmt=None):

# did_you_mean {{{2
def did_you_mean(invalid_str, valid_strs):

"""Given an invalid string from the user, return the valid string with the most similarity.
This function requires that the *difflib* package be installed before it can
be used.
Args:
invalid_str (string):
The invalid string given by the user.
Expand Down
2 changes: 2 additions & 0 deletions run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
echo "#########"
echo Python 2:
echo "#########"
pip2 install --user --upgrade .
# python2 test.doctests.py
python2 test.inform.py
py.test-2
Expand All @@ -11,6 +12,7 @@ echo
echo "#########"
echo Python 3:
echo "#########"
pip3 install --user --upgrade .
python3 test.doctests.py
python3 test.inform.py
py.test-3
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
packages = ['inform'],
install_requires = dependencies.split(),
setup_requires = 'pytest-runner>=2.0'.split(),
tests_require = 'pytest pytest-cov hypothesis'.split(),
tests_require = 'pytest pytest-cov hypothesis difflib'.split(),
python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
keywords = 'inform logging printing'.split(),
classifiers = [
Expand Down

0 comments on commit a710e14

Please sign in to comment.