Skip to content

Commit

Permalink
Removed test_py33 requirements file, not needed with environment markers
Browse files Browse the repository at this point in the history
  • Loading branch information
nicfit committed Jan 12, 2019
1 parent 5cd30f9 commit 96cc74d
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 11 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ install:
- pip install coveralls
- pip install -e .
- make TEST_DATA_DIR=$HOME test-data
- test $(python -c 'import sys;print("{}{}".format(sys.version_info.major, sys.version_info.minor))') -gt 33 || pip install -r requirements/test_py33.txt

# command to run tests
script: make coverage
Expand Down
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Release History

.. :changelog:
v0.8.9 (2019-01-11) : Descent Into...
v0.8.9 (2019-01-12) : Descent Into...
--------------------------------------

Changes
Expand Down
5 changes: 1 addition & 4 deletions requirements/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ test:
- pytest-cov
- pytest-runner
- factory-boy

test_py33:
- pathlib
- mock
- mock; python_version < '3.4'

dev:
- nicfit.py[cookiecutter]
Expand Down
1 change: 1 addition & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
factory-boy==2.11.1
mock; python_version < '3.4'
pytest==4.0.2
pytest-cov==2.6.1
pytest-runner==4.2
2 changes: 0 additions & 2 deletions requirements/test_py33.txt

This file was deleted.

2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ def package_files(directory, prefix=".."):
sys.exit(0)
else:
test_requirements = REQUIREMENTS["test"]
if sys.version_info[:2] < (3, 4):
test_requirements += REQUIREMENTS["test_py33"]
# The extra command line options we added cause warnings, quell that.
with warnings.catch_warnings():
warnings.filterwarnings("ignore", message="Unknown distribution option")
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ commands = coverage run --rcfile=setup.cfg --source ./src/eyed3 --append -m \
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements/test.txt
py27,py33,pypy: -r{toxinidir}/requirements/test_py33.txt


[testenv:report]
Expand Down

0 comments on commit 96cc74d

Please sign in to comment.