Skip to content

Commit

Permalink
Merge branch 'master' of github.com:SethMMorton/natsort
Browse files Browse the repository at this point in the history
  • Loading branch information
SethMMorton committed Jan 29, 2022
2 parents b85dea2 + 9616d29 commit da2e323
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Unreleased

### Changed
- MacOS unit tests run on native Python
- Treate `None` like `NaN` internally to avoid `TypeError` (issue #117)
- Treat `None` like `NaN` internally to avoid `TypeError` (issue #117)
- No longer fail tests every time a new Python version is released (issue #122)

### Fixed
Expand All @@ -76,7 +76,7 @@ Unreleased
- Release checklist in `RELEASING.md` ([@hugovk](https://github.com/hugovk), issue #106)

### Changed
- Updated auxillary shell scripts to be written in python, and added
- Updated auxiliary shell scripts to be written in python, and added
ability to call these from `tox`
- Improved Travis-CI experience
- Update testing dependency versions
Expand Down Expand Up @@ -281,7 +281,7 @@ Unreleased
because the new factory function paradigm eliminates most `if` branches
during execution). For the most cases, the code is 30-40% faster than version 4.0.4.
If using `ns.LOCALE` or `humansorted`, the code is 1100% faster than version 4.0.4
- Improved clarity of documentaion with regards to locale-aware sorting
- Improved clarity of documentation with regards to locale-aware sorting

### Deprecated
- `ns.TYPESAFE` option as it is now always on (due to a new
Expand Down Expand Up @@ -427,7 +427,7 @@ Unreleased
- `reverse` option to `natsorted` & co. to make it's API more
similar to the builtin 'sorted'
- More unit tests
- Auxillary test code that helps in profiling and stress-testing
- Auxiliary test code that helps in profiling and stress-testing
- Support for coveralls.io

### Changed
Expand Down Expand Up @@ -574,7 +574,7 @@ a pipeline by which to filter
---

### Added
- Tests into the natsort.py file iteself
- Tests into the natsort.py file itself

### Changed
- Reorganized directory structure
Expand Down
2 changes: 1 addition & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ the corresponding regular expression to locate numbers will be returned.
Help With Type Hinting
++++++++++++++++++++++

If you need to explictly specify the types that natsort accepts or returns
If you need to explicitly specify the types that natsort accepts or returns
in your code, the following types have been exposed for your convenience.

+--------------------------------+----------------------------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ you can easily do this with the ``ns.IGNORECASE`` option:
>>> natsorted(a, alg=ns.IGNORECASE)
['Apple', 'apple', 'Banana', 'banana', 'corn', 'Corn']
Note thats since Python's sorting is stable, the order of equivalent
Note that's since Python's sorting is stable, the order of equivalent
elements after lowering the case is the same order they appear in the
original list.

Expand Down
2 changes: 1 addition & 1 deletion docs/locale_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Regenerate Key With :func:`~natsort.natsort_keygen` After Changing Locale

When :func:`~natsort.natsort_keygen` is called it returns a key function that
hard-codes the provided settings. This means that the key returned when
``ns.LOCALE`` is used contains the settings specifed by the locale
``ns.LOCALE`` is used contains the settings specified by the locale
*loaded at the time the key is generated*. If you change the locale,
you should regenerate the key to account for the new locale.

Expand Down
4 changes: 2 additions & 2 deletions natsort/natsort.py
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ def os_sorted(
.. warning::
The resulting function will generate results that will be
differnt depending on your platform. This is intentional.
different depending on your platform. This is intentional.
On Windows, this will sort with the same order as Windows Explorer.
Expand All @@ -893,7 +893,7 @@ def os_sorted(
special characters this will give correct results, but once
special characters are added you should lower your expectations.
It is *strongly* reccommended to have :mod:`pyicu` installed on
It is *strongly* recommended to have :mod:`pyicu` installed on
MacOS/Linux if you want correct sort results.
It does *not* take into account if a path is a directory or a file
Expand Down
2 changes: 1 addition & 1 deletion natsort/unicode_numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# The digit characters are a subset of the numerals.
digit_chars = [a for a in numeric_chars if unicodedata.digit(a, None) is not None]

# The decimal characters are a subset of the numberals
# The decimal characters are a subset of the numerals
# (probably of the digits, but let's be safe).
decimal_chars = [a for a in numeric_chars if unicodedata.decimal(a, None) is not None]

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[tox]
envlist =
flake8, mypy, py36, py37, py38, py39, py310
# Other valid evironments are:
# Other valid environments are:
# docs
# release
# clean
Expand Down

0 comments on commit da2e323

Please sign in to comment.