Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package update, add missing dependency chardet #75

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dist
.tox/
.coverage
coverage.xml
.idea/

# caches
.mypy_cache/
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ before_cache:
jobs:
include:
# linux
- python: '3.9'
script: python3 -m tox -e py39 -- --cov-report=xml
Comment on lines +17 to +18
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👍

- python: '3.8'
script: python3 -m tox -e py38 -- --cov-report=xml
- python: '3.7'
Expand Down
34 changes: 17 additions & 17 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ verify_ssl = true

[dev-packages]
pipenv-setup = {editable = true,path = "."}
pytest = {markers = "python_version>='3.6'",version = "~=5.2"}
pytest-mypy = {markers = "python_version>='3.5'",version = "~=0.3"}
pytest-cov = "~=2.7"
pytest-datadir = "~=1.3"
pytest-xdist = "~=1.29"
tox = "~=3.14"
autopep8 = "~=1.4"
pytest = "*"
pytest-mypy = "*"
pytest-cov = "*"
pytest-datadir = "*"
pytest-xdist = "*"
tox = "*"
autopep8 = "*"

[packages]
pipfile = "~=0.0"
black = {markers = "python_version>='3.6'",version = "==19.10b0"}
colorama = "~=0.4"
packaging = "~=20.0"
requirementslib = "~=1.5"
vistir = "~=0.4"
autopep8 = {markers = "python_version<'3.6'",version = "~=1.4"}
six = "~=1.12"
typing = {markers = "python_version<'3.7'", version = "~=3.7"}
chardet = ">=3.0.0, <=5.0.0"
pipfile = "*"
black = {markers = "python_version>='3.6'",version = ">=19.10b0"}
colorama = "*"
packaging = "*"
requirementslib = "*"
vistir = "*"
autopep8 = {markers = "python_version<'3.6'"}
six = "*"
typing = {markers = "python_version<'3.7'"}
chardet = "*"

[scripts]
# use this to sync this pipfile to setup.py, explained in CONTRIBUTING.md
Expand Down
857 changes: 448 additions & 409 deletions Pipfile.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
37 changes: 19 additions & 18 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# For a discussion on single-sourcing the version across setup.py and the
# project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version="3.1.2", # Required
version="3.1.1", # Required
# This is a one-line description or tagline of what your project does. This
# corresponds to the "Summary" metadata field:
# https://packaging.python.org/specifications/core-metadata/#summary
Expand Down Expand Up @@ -102,6 +102,7 @@
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
# This field adds keywords for your project which will appear on the
# project page. What does your project relate to?
Expand Down Expand Up @@ -136,26 +137,26 @@
# https://packaging.python.org/en/latest/requirements.html
extras_require={
"dev": [
"pytest~=5.2; python_version >= '3.6'",
"pytest-mypy~=0.3; python_version >= '3.5'",
"pytest-cov~=2.7",
"pytest-datadir~=1.3",
"pytest-xdist~=1.29",
"tox~=3.14",
"autopep8~=1.4",
"pytest",
"pytest-mypy",
"pytest-cov",
"pytest-datadir",
"pytest-xdist",
"tox",
"autopep8",
]
},
install_requires=[
"pipfile~=0.0",
"black==19.10b0; python_version >= '3.6'",
"colorama~=0.4",
"packaging~=20.0",
"requirementslib~=1.5",
"vistir~=0.4",
"autopep8~=1.4; python_version < '3.6'",
"six~=1.12",
"typing~=3.7; python_version < '3.7'",
"chardet>=3.0.0,<=5.0.0",
"pipfile",
"black>=19.10b0; python_version >= '3.6'",
"colorama",
"packaging",
"requirementslib",
"vistir",
"autopep8; python_version < '3.6'",
"six",
"typing; python_version < '3.7'",
"chardet",
], # Optional
entry_points={
"console_scripts": ["pipenv-setup=pipenv_setup.main:cmd"]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py35, py36, py37, py38
envlist = py27, py35, py36, py37, py38, py39
skip_missing_interpreters=true

[testenv]
Expand Down