Commit Graph

864 Commits

Author SHA1 Message Date
David Read 84b0462979 No need to go back twice 2016-02-15 15:36:02 +00:00
David Read 794fc93230 Maintain compatibility with rest-style updates 2016-02-15 15:23:39 +00:00
David Read f22100e6c2 Merge remote-tracking branch 'origin' into 157-version-three-apify 2016-02-15 15:20:33 +00:00
Ross Jones b485aa97e5 Merge pull request #223 from ckan/tidy
PEP8 / tidy
2016-02-15 15:05:24 +00:00
David Read bf0d1fd779 Fix name error 2016-02-15 13:54:58 +00:00
David Read 4516bfe44e PEP8 and lint, extracted from PR158 2016-02-15 13:50:18 +00:00
David Read 49faa0ae6c Tests for CKANHarvester._last_error_free_job 2016-02-15 13:30:28 +00:00
David Read 385b369148 Error-free jobs now include ones where an object was not modified. 2016-02-15 13:16:23 +00:00
David Read f63140354d Fix logic error in previous commit 2016-02-15 12:28:46 +00:00
David Read 52c071dbe9 Improved error handling. e.g. if the site it harvests just returns errors. 2016-02-15 12:10:44 +00:00
David Read 4c1f27161e Fix merge 2016-02-12 18:22:36 +00:00
David Read 331ad84272 Deal with worry about datasets on the remote CKAN being added/removed during harvest. 2016-02-12 18:00:00 +00:00
David Read 7096b7ddf2 Merge branch 'master' of github.com:ckan/ckanext-harvest into 157-version-three-apify 2016-02-12 16:51:26 +00:00
amercader 6354ad5656 Fix source clean command on CKAN > 2.5, as related don't exist any more 2016-02-04 13:40:02 +00:00
amercader 86edc4209b Merge branch '219-missing-form' 2016-02-04 12:50:58 +00:00
amercader b2df2cab05 Test 2.5 on travis 2016-01-14 11:43:37 +00:00
amercader b58cd8b38f Merge branch 'master' into 219-missing-form
Conflicts:
	ckanext/harvest/templates_new/source/edit.html
	ckanext/harvest/templates_new/source/new.html
	test-core.ini
2016-01-14 11:43:12 +00:00
amercader 73196b942b Merge branch '214-remove-genshi' 2016-01-14 11:28:55 +00:00
amercader 5d23fab03f [#219] Support CKAN < 2.3 2016-01-14 11:23:41 +00:00
amercader 5bf0ac9b86 [#219] Fix tests auth 2016-01-14 11:23:17 +00:00
amercader 0bae79b526 Run tests with debug=false 2016-01-14 11:15:48 +00:00
amercader 1665e86065 [#219] Don't use c.form to render the form 2016-01-14 10:16:45 +00:00
amercader 497dfeea02 Add test for missing form 2016-01-14 10:15:46 +00:00
David Read aaa7dc9e4d Merge pull request #218 from metaodi/217-run-test-ckan23
Swap import statements to make sure `run_test` works on CKAN 2.3
2016-01-12 09:17:24 +00:00
Stefan Oderbolz e0c3316531 Add legacy import for CreateTestData 2016-01-11 22:35:11 +01:00
Stefan Oderbolz c141cf44fa Swap import statements to make sure `run_test` works on CKAN 2.3 2016-01-11 22:13:25 +01:00
David Read 82f48d5afa [#214] Move ckanext/harvest/templates/templates_new to ckanext/harvest/templates 2015-12-11 15:24:45 +00:00
amercader 6b23208b2a Merge branch '212-module-import-error' 2015-12-11 13:38:32 +00:00
David Read d08f72ad13 Fix tests for ckan 2.2 again with amercaders suggestion. 2015-12-11 11:53:51 +00:00
David Read 6ef58addbc Fix tests for ckan 2.2 again with amercaders suggestion. 2015-12-11 11:52:00 +00:00
David Read f0ba0c865c Fix tests for ckan 2.2 2015-12-10 16:36:27 +00:00
David Read 77f98d5b18 Compatibility with ckan 2.2. 2015-12-10 16:33:09 +00:00
David Read 8f54421c99 [#214] ckan.legacy_templates=True is really harmless, so just warn if it is set. 2015-12-10 16:11:56 +00:00
David Read 260cd1f2b7 Merge branch 'master' of github.com:ckan/ckanext-harvest into 214-remove-genshi 2015-12-10 16:02:50 +00:00
David Read b4370f35b7 Note that CKAN 2 is the minimum version now genshi is removed. 2015-12-10 16:02:07 +00:00
David Read dd6c8a6987 Extracted strings to update pot and po. 2015-12-10 15:54:20 +00:00
David Read fa1ec64cc7 Rename templates_new dir to templates. 2015-12-10 15:52:46 +00:00
David Read 8f3006f494 [#214] Config for legacy templates removed. 2015-12-10 15:46:57 +00:00
David Read 41975a93d8 [#214] Removed genshi templates 2015-12-10 15:32:20 +00:00
amercader 468a195a25 Merge branch 'import-guid' 2015-12-10 13:37:23 +00:00
amercader 5ff3ef9d17 Merge branch '205-inconsistent-stats' 2015-12-10 13:36:15 +00:00
amercader 9d06820bcd Merge branch 'error_creation_moved_to_model' 2015-12-10 13:25:05 +00:00
amercader b7a0343763 Merge branch 'abort-by-job' 2015-12-10 13:22:40 +00:00
amercader 82fe2d0e53 Merge branch 'fetch_unchanged' 2015-12-10 13:19:45 +00:00
amercader 80b82ee968 Merge branch 'factory-job' 2015-12-10 13:18:19 +00:00
amercader 52fe7fb21d Merge branch 'named-exceptions' 2015-12-10 13:17:18 +00:00
amercader 072698b4bb Merge branch 'validator-raise' 2015-12-10 13:16:26 +00:00
amercader 4cc39e5ef4 Merge branch 'test-guid-fix' 2015-12-10 13:15:54 +00:00
amercader 04162ce9e4 Merge branch 'munge-tag' 2015-12-10 13:15:17 +00:00
David Read 4ca4b3a2f2 Merge pull request #213 from ckan/212-module-import-error
[#212] Fixes #212 - auth for harvest_job_create was broken.
2015-12-09 15:52:37 +00:00