Skip to content

Commit

Permalink
Merge branch 'master' into add-merge-schema
Browse files Browse the repository at this point in the history
  • Loading branch information
starrify committed May 28, 2019
2 parents 57bc71a + 154cc05 commit b53224e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
install_requires=['scrapy', 'jsonschema', 'six']
)
2 changes: 1 addition & 1 deletion tests/test_pipeline.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from unittest import TestCase

from scrapy.statscol import StatsCollector
from scrapy.statscollectors import StatsCollector
from scrapy.exceptions import DropItem
from scrapy_jsonschema.pipeline import JsonSchemaValidatePipeline
from scrapy_jsonschema.item import JsonSchemaItem
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py27, py35
envlist = py27, py35, py36, py37

[testenv]
deps =
Expand Down

0 comments on commit b53224e

Please sign in to comment.