Skip to content

Commit

Permalink
Remove deprecated packages from pre-commit and upgrade dependencies. (a…
Browse files Browse the repository at this point in the history
  • Loading branch information
jadchaar authored Aug 20, 2020
1 parent c75cd22 commit 90b33b0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
14 changes: 5 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -15,20 +15,16 @@ repos:
- id: check-docstring-first
- id: check-merge-conflict
- id: debug-statements
- repo: https://github.com/asottile/seed-isort-config
rev: v2.2.0
hooks:
- id: seed-isort-config
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.1.1
- repo: https://github.com/timothycrosley/isort
rev: 5.4.2
hooks:
- id: isort
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.1
rev: v2.7.2
hooks:
- id: pyupgrade
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.5.1
rev: v1.6.0
hooks:
- id: python-no-eval
- id: python-check-blanket-noqa
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ dateparser==0.7.*
pre-commit==1.21.*; python_version <= "3.5"
pre-commit==2.6.*; python_version >= "3.6"
pytest==4.6.*; python_version == "2.7"
pytest==5.4.*; python_version >= "3.5"
pytest==6.0.*; python_version >= "3.5"
pytest-cov==2.10.*
pytest-mock==2.0.*; python_version == "2.7"
pytest-mock==3.2.*; python_version >= "3.5"
python-dateutil==2.8.*
pytz==2019.*
simplejson==3.17.*
sphinx==1.8.*; python_version == "2.7"
sphinx==3.1.*; python_version >= "3.5"
sphinx==3.2.*; python_version >= "3.5"
8 changes: 2 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ python =
3.8: py38
3.9: py39

# Configure testing environments

[testenv]
deps = -rrequirements.txt
allowlist_externals = pytest
Expand All @@ -40,16 +38,14 @@ commands =
doc8 index.rst ../README.rst --extension .rst --ignore D001
make html SPHINXOPTS="-W --keep-going"

# Configure settings for pytest, isort, and flake8

[pytest]
addopts = -v --cov-branch --cov=arrow tests --cov-fail-under=100 --cov-report=term-missing --cov-report=xml
addopts = -v --cov-branch --cov=arrow --cov-fail-under=100 --cov-report=term-missing --cov-report=xml
testpaths = tests

[isort]
line_length = 88
multi_line_output = 3
include_trailing_comma = true
known_third_party = dateutil,pytest,pytz,setuptools,simplejson

[flake8]
per-file-ignores = arrow/__init__.py:F401
Expand Down

0 comments on commit 90b33b0

Please sign in to comment.