Skip to content

Commit

Permalink
Merge pull request #37 from CircleUp/fix-build
Browse files Browse the repository at this point in the history
ci: update dev requirements and resolve dep conflict
  • Loading branch information
brycedrennan committed Dec 8, 2019
2 parents 4c95d1e + f9924d6 commit 94ea9a0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ autoformat: ## Run the autoformatter.
@black .

test: ## Run the tests.
@pytest -n auto
@pytest
@echo -e "The tests pass! ✨ 🍰 ✨"

lint: ## Run the code linter.
Expand Down
2 changes: 1 addition & 1 deletion aresponses/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _host_matches(self, match_host):

async def _find_response(self, request):
host, path, path_qs, method = request.host, request.path, request.path_qs, request.method
logger.info(f"Looking for match for {host} {path} {method}")
logger.info(f"Looking for match for {host} {path} {method}") # noqa
i = 0
host_matched = False
path_matched = False
Expand Down
17 changes: 8 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# dev/testing requirements
black==18.9b0
coverage==4.5.1
pydocstyle==2.1.1
pylava==0.2.1
pylava-pylint==0.0.2
pylint==2.1.1
pytest==3.6.4
pytest-asyncio==0.9.0
pytest-cov==2.6.0
pytest-xdist==1.23.2
coverage==4.5.4
pydocstyle==4.0.1
pylava==0.2.2
pylava-pylint==0.0.3
pylint==2.4.4
pytest==5.3.1
pytest-asyncio==0.10.0
pytest-cov==2.8.1

# install setup.py
-e .

0 comments on commit 94ea9a0

Please sign in to comment.