From 01239ab86cdfd92a905a2800660f683e5cfc4c23 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Thu, 1 Sep 2016 13:43:34 -0400 Subject: [PATCH 1/4] Upgrade path.py --- requirements/edx/base.txt | 2 +- requirements/edx/paver.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 47e5b894f7..6e476c255f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -67,7 +67,7 @@ networkx==1.7 nose-xunitmp==0.3.2 oauthlib==1.0.3 paramiko==1.9.0 -path.py==7.2 +path.py==8.2.1 piexif==1.0.2 Pillow==3.1.1 polib==1.0.3 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 3bbf9bca1b..b4bd1eb065 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -2,7 +2,7 @@ Paver==1.2.4 psutil==1.2.1 lazy==1.1 -path.py==7.2 +path.py==8.2.1 watchdog==0.7.1 python-memcached libsass==0.10.0 From 4b580e11ccb5b7abb8b11bf8d51572e1be28e093 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Thu, 1 Sep 2016 06:26:24 -0400 Subject: [PATCH 2/4] Update node packages to match pa11ycrawler's node install. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 42f7fe486f..0eccf1d754 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "karma-junit-reporter": "^0.4.1", "karma-requirejs": "^0.2.6", "karma-spec-reporter": "^0.0.20", - "pa11y": "3.6.0", - "pa11y-reporter-1.0-json": "1.0.2", + "pa11y": "4.0.1", + "pa11y-reporter-json-oldnode": "1.0.0", "plato": "1.2.2" } } From afd31d4edfc9f0ee3ea70728c166fe4988416d42 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 7 Sep 2016 12:56:19 -0400 Subject: [PATCH 3/4] pa11ycrawler 1.5.0 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 21bd269386..89bf6350b6 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -69,7 +69,7 @@ git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx # Used for testing git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -git+https://github.com/edx/pa11ycrawler.git@1.3.0#egg=pa11ycrawler==1.3.0 +git+https://github.com/edx/pa11ycrawler.git@1.5.0#egg=pa11ycrawler==1.5.0 # Our libraries: git+https://github.com/edx/XBlock.git@xblock-0.4.12#egg=XBlock==0.4.12 From 32e7836bd9c35ef48e5ba6db078946faedb53456 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 7 Sep 2016 13:00:18 -0400 Subject: [PATCH 4/4] Add pa11y_ignore_rules_url to `paver pa11ycrawler` --- pavelib/paver_tests/test_paver_bok_choy_cmds.py | 7 +++++++ pavelib/utils/test/suites/bokchoy_suite.py | 3 +++ 2 files changed, 10 insertions(+) diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index cca28d4802..c279f811c5 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -201,6 +201,11 @@ class TestPaverPa11yCrawlerCmd(unittest.TestCase): suite = Pa11yCrawler( 'pa11ycrawler', course_key="course-v1:edX+Test101+course", ) + ignore = ( + "pa11y_ignore_rules_url=" + "https://raw.githubusercontent.com/singingwolfboy/" + "pa11ycrawler-ignore/master/ignore.yaml" + ) expected_cmd = [ "scrapy", "crawl", @@ -210,6 +215,8 @@ class TestPaverPa11yCrawlerCmd(unittest.TestCase): "-a", "course_key=course-v1:edX+Test101+course", "-a", + ignore, + "-a", "data_dir=/edx/app/edxapp/edx-platform/reports/pa11ycrawler/data", ] actual_cmd = suite.cmd diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py index f4030f756f..06101dc1c2 100644 --- a/pavelib/utils/test/suites/bokchoy_suite.py +++ b/pavelib/utils/test/suites/bokchoy_suite.py @@ -395,6 +395,7 @@ class Pa11yCrawler(BokChoyTestSuite): Runs pa11ycrawler as staff user against the test course. """ data_dir = os.path.join(self.report_dir, 'data') + url = "https://raw.githubusercontent.com/singingwolfboy/pa11ycrawler-ignore/master/ignore.yaml" return [ "scrapy", "crawl", @@ -404,5 +405,7 @@ class Pa11yCrawler(BokChoyTestSuite): "-a", "course_key={key}".format(key=self.course_key), "-a", + "pa11y_ignore_rules_url={url}".format(url=url), + "-a", "data_dir={dir}".format(dir=data_dir) ]