Skip to content
Merged
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ build27 build35 build36 build37 build38:
venv/bin/pre-commit install

test:
rm -f .coverage
. venv/bin/activate && nosetests
rm -f .coverage coverage.xml
. venv/bin/activate && pytest

lint:
venv/bin/pre-commit run --all-files --show-diff-on-failure
Expand All @@ -27,7 +27,7 @@ docs:
clean:
rm -rf venv .tox ./**/__pycache__
rm -rf dist build .egg .eggs arrow.egg-info
rm -f ./**/*.pyc .coverage
rm -f ./**/*.pyc .coverage coverage.xml

publish:
rm -rf dist build .egg .eggs arrow.egg-info
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
backports.functools_lru_cache==1.6.1; python_version == "2.7"
chai==1.1.2
dateparser==0.7.*
mock==3.0.*
nose==1.3.7
nose-cov==1.6
pre-commit==1.20.*
pytest==4.6.*; python_version == "2.7"
pytest==5.3.*; python_version >= "3.5"
pytest-cov==2.8.*
pytest-mock==2.0.*
python-dateutil==2.8.*
pytz==2019.*
simplejson==3.16.*
Expand Down
30 changes: 7 additions & 23 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
[nosetests]
where = tests
verbosity = 2
all-modules = true
with-coverage = true
cover-min-percentage = 100
cover-package = arrow
cover-erase = true

[coverage:run]
branch = true
source =
arrow
tests

[coverage:report]
show_missing = true
fail_under = 100

[flake8]
per-file-ignores = arrow/__init__.py:F401
ignore = E203,E501,W503
[tool:pytest]
addopts = -v --cov-branch --cov=arrow tests --cov-fail-under=100 --cov-report=term-missing --cov-report=xml

[tool:isort]
line_length = 88
multi_line_output = 3
include_trailing_comma = true
known_third_party = chai,dateparser,dateutil,mock,pytz,setuptools,simplejson
known_third_party = dateparser,dateutil,pytest,pytz,setuptools,simplejson

[flake8]
per-file-ignores = arrow/__init__.py:F401
ignore = E203,E501,W503

[bdist_wheel]
universal = 1
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
"python-dateutil",
"backports.functools_lru_cache>=1.2.1;python_version=='2.7'",
],
test_suite="tests",
tests_require=["chai", "mock"],
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
Expand Down
33 changes: 0 additions & 33 deletions tests/api_tests.py

This file was deleted.

Loading