Skip to content

Commit

Permalink
chore: Bump versions for testing. Fix testing for aiohttp 2.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
playpauseandstop committed Feb 4, 2018
1 parent b38f465 commit 3b934e9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
17 changes: 9 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ VENV = $(shell python -c "import sys; print(int(hasattr(sys, 'real_prefix')));")
# Python commands
ifeq ($(VENV),1)
COVERALLS = coveralls
PYTHON = python
SPHINXBUILD = sphinx-build
TOX = tox
TWINE = twine
else
COVERALLS = $(ENV)/bin/coveralls
PYTHON = $(ENV)/bin/python
SPHINXBUILD = `pwd`/$(ENV)/bin/sphinx-build
TOX = $(ENV)/bin/tox
TWINE = $(ENV)/bin/twine
endif

# Bootstrapper args
Expand Down Expand Up @@ -52,7 +50,7 @@ ifeq ($(CIRCLECI),)
endif
rm -rf build/ dist/
python setup.py sdist bdist_wheel
$(TWINE) upload dist/*
$(PYTHON) -m twine upload dist/*

distclean: clean
rm -rf build/ dist/ *.egg*/ $(ENV)/
Expand All @@ -62,18 +60,21 @@ docs: .install

install: .install
.install: setup.py requirements-dev.txt
bootstrapper -d -e $(ENV)/ $(bootstrapper_args)
python -m bootstrapper -r requirements-dev.txt -e $(ENV)/ $(bootstrapper_args)
touch $@

lint:
TOXENV=lint $(MAKE) test

list-outdated: .install
$(PYTHON) -m pip list -lo

setup-pyenv:
ifneq ($(CIRCLECI),)
pyenv local 3.5.3 3.6.2
else
pyenv local 3.5.4 3.6.3
pyenv local 3.5.4 3.6.4
endif

test: .install clean
$(TOX) $(tox_args) $(TOX_ARGS) -- $(TEST_ARGS)
$(PYTHON) -m tox $(tox_args) $(TOX_ARGS) -- $(TEST_ARGS)
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
coveralls==1.2.0
Sphinx==1.6.6
sphinx-autodoc-typehints==1.2.3
sphinx-autodoc-typehints==1.2.4
tox==2.9.1
tox-pyenv==1.1.0
twine==1.9.1
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ deps =
aiohttp20: aiohttp==2.0.7
aiohttp21: aiohttp==2.1.0
aiohttp22: aiohttp==2.2.5
aiohttp23: aiohttp==2.3.7
aiohttp22: yarl==0.18.0
aiohttp23: aiohttp==2.3.10
aiohttp23: async_timeout==2.0.0
coverage==4.4.2
coverage==4.5
fastjsonschema==1.1
jsl==0.2.4
jsonschema==2.6.0
pytest==3.2.3
py35: pytest==3.2.3
py36: pytest==3.4.0
pytest-aiohttp==0.1.3
pytest-cov==2.5.1
passenv =
Expand Down

0 comments on commit 3b934e9

Please sign in to comment.