Skip to content

Commit

Permalink
Patch refresh 1.3.5 (#34)
Browse files Browse the repository at this point in the history
* 🔧 Dependencies refactor and add py 3.9 and 3.10 to the supported list

* 🐛 Fix python 3.8.3rc1, version parsing fails #33

* 🔧 travis add py 3.8, 3.9, and 3.10 and remove 2.7

* 🔖 Bump to version 1.3.5

* 📝 Update readme.md
  • Loading branch information
Ousret authored Feb 8, 2021
1 parent c1cbe6f commit a434ac1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
language: python
python:
- "2.7"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "3.9"
- "3.10-dev"

matrix:
allow_failures:
- python: "2.7"
- python: "3.5" # TODO: Investigate why language detection act differently
- python: "3.10-dev"

install:
- pip install nose codecov
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1 align="center">Welcome to Charset Detection for Humans 👋 <a href="https://twitter.com/intent/tweet?text=The%20Real%20First%20Universal%20Charset%20%26%20Language%20Detector&url=https://www.github.com/Ousret/charset_normalizer&hashtags=python,encoding,chardet,developers"><img src="https://img.shields.io/twitter/url/http/shields.io.svg?style=social"/></a></h1>
<h1 align="center">Charset Detection, for everyone 👋 <a href="https://twitter.com/intent/tweet?text=The%20Real%20First%20Universal%20Charset%20%26%20Language%20Detector&url=https://www.github.com/Ousret/charset_normalizer&hashtags=python,encoding,chardet,developers"><img src="https://img.shields.io/twitter/url/http/shields.io.svg?style=social"/></a></h1>

<p align="center">
<sup>The Real First Universal Charset Detector</sup><br>
Expand Down
4 changes: 2 additions & 2 deletions charset_normalizer/normalizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import statistics
from encodings.aliases import aliases
from os.path import basename, splitext
from platform import python_version_tuple
from sys import version_info
from warnings import warn

from cached_property import cached_property
Expand Down Expand Up @@ -392,7 +392,7 @@ def from_bytes(sequences, steps=10, chunk_size=512, threshold=0.20, cp_isolation
excluded_list=', '.join(cp_exclusion))

# Bellow Python 3.6, Expect dict to not behave the same.
py_v = [int(el) for el in python_version_tuple()]
py_v = [int(el) for el in (version_info.major, version_info.minor, version_info.micro,)]
py_need_sort = py_v[0] < 3 or (py_v[0] == 3 and py_v[1] < 6)

supported = collections.OrderedDict(aliases).items() if py_need_sort else aliases.items()
Expand Down
2 changes: 1 addition & 1 deletion charset_normalizer/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Expose version
"""

__version__ = "1.3.4"
__version__ = "1.3.5"
VERSION = __version__.split('.')
11 changes: 6 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ def get_version():
VERSION = get_version()

REQUIRED = [
'cached_property',
'dragonmapper',
'zhon',
'prettytable',
'loguru'
'cached_property>=1.5,<2.0',
'dragonmapper>=0.2,<0.3',
'prettytable>=1.0,<2.0',
'loguru>=0.5,<0.6'
]

EXTRAS = {
Expand Down Expand Up @@ -80,6 +79,8 @@ def get_version():
'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 :: Text Processing :: Linguistic',
'Topic :: Utilities',
'Programming Language :: Python :: Implementation :: PyPy'
Expand Down

0 comments on commit a434ac1

Please sign in to comment.