mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 19:20:56 +01:00
Code Issues Releases Wiki Activity
8,604 Commits 56 Branches 258 Tags 413 MiB
aa5f2497ea
Commit Graph

108 Commits

Author SHA1 Message Date
Karl Hobley
cac3a65a3d Travis/tox configuration for Elasticsearch 6 2018-05-04 15:57:36 +01:00
Bertrand Bordage
e87ff07e7b Merge branch 'master' into search-query-api 
# Conflicts:
#	wagtail/search/backends/db.py
#	wagtail/search/backends/elasticsearch2.py
 2018-01-03 18:36:57 +01:00
Matt Westcott
cca7653839 Specify django-taggit 0.22.2 for Django 2.0 support 2018-01-02 14:47:07 +00:00
Andy Babic
4a7320a0db Use master branch of taggit for django 2.0 tests (jdufresne's pull has been merged, and the branch deleted) 2017-12-21 23:54:23 +00:00
Bertrand Bordage
ef125bde56 Merge branch 'master' into search-query-api 
# Conflicts:
#	wagtail/search/tests/test_elasticsearch2_backend.py
#	wagtail/search/tests/test_elasticsearch5_backend.py
 2017-12-14 18:59:03 +01:00
Matt Westcott
c96b2848bc Use django-modelcluster 4.0 2017-12-13 16:07:50 +00:00
Matt Westcott
55a045f723 Test against Django 2.0 final release 2017-12-04 12:58:29 +00:00
Matt Westcott
c2af41b4b9 Add Django 2.0 to travis 2017-12-04 12:58:29 +00:00
Bertrand Bordage
0bcf6a110d Merge branch 'master' into search-query-api 
# Conflicts:
#	wagtail/contrib/postgres_search/backend.py
#	wagtail/contrib/postgres_search/utils.py
#	wagtail/core/tests/test_page_queryset.py
#	wagtail/search/backends/base.py
#	wagtail/search/backends/db.py
#	wagtail/search/backends/elasticsearch2.py
#	wagtail/search/queryset.py
#	wagtail/search/tests/elasticsearch_common_tests.py
#	wagtail/search/tests/test_backends.py
#	wagtail/search/tests/test_elasticsearch2_backend.py
#	wagtail/search/tests/test_elasticsearch5_backend.py
#	wagtail/search/utils.py
 2017-11-30 01:53:09 +01:00
Karl Hobley
19730bea53 Renamed wagtail.wagtailsearch to wagtail.search 
Conflicts:
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	docs/getting_started/tutorial.rst
	docs/topics/pages.rst
	docs/topics/search/searching.rst
	tox.ini
	wagtail/admin/tests/test_pages_views.py
	wagtail/admin/views/mixins.py
	wagtail/api/v2/filters.py
	wagtail/contrib/wagtailsearchpromotions/forms.py
	wagtail/contrib/wagtailsearchpromotions/views.py
	wagtail/documents/models.py
	wagtail/documents/views/chooser.py
	wagtail/documents/views/documents.py
	wagtail/documents/views/multiple.py
	wagtail/images/migrations/0001_initial.py
	wagtail/images/models.py
	wagtail/images/views/chooser.py
	wagtail/images/views/images.py
	wagtail/images/views/multiple.py
	wagtail/project_template/project_name/settings/base.py
	wagtail/project_template/search/views.py
	wagtail/search/tests/test_frontend.py
	wagtail/search/tests/test_index_functions.py
	wagtail/search/views/frontend.py
	wagtail/search/views/queries.py
	wagtail/search/wagtail_hooks.py
	wagtail/tests/demosite/models.py
	wagtail/tests/modeladmintest/models.py
	wagtail/tests/non_root_urls.py
	wagtail/tests/settings.py
	wagtail/tests/snippets/models.py
	wagtail/tests/testapp/migrations/0001_initial.py
	wagtail/tests/testapp/migrations/0020_customdocument.py
	wagtail/tests/testapp/models.py
	wagtail/tests/urls.py
	wagtail/wagtailsnippets/views/chooser.py
	wagtail/wagtailsnippets/views/snippets.py
 2017-11-26 22:43:47 +00:00
Karl Hobley
bf0f3e02ba Rename wagtail.wagtailimages to wagtail.images 
Conflicts:
	docs/advanced_topics/api/v2/configuration.rst
	docs/advanced_topics/jinja2.rst
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	docs/getting_started/tutorial.rst
	docs/topics/pages.rst
	docs/topics/streamfield.rst
	gulpfile.js/config.js
	tox.ini
	wagtail/admin/tests/test_compare.py
	wagtail/admin/tests/test_edit_handlers.py
	wagtail/api/v2/signal_handlers.py
	wagtail/contrib/wagtailstyleguide/views.py
	wagtail/core/tests/test_streamfield.py
	wagtail/documents/tests/test_models.py
	wagtail/images/models.py
	wagtail/images/permissions.py
	wagtail/images/tests/test_admin_views.py
	wagtail/images/tests/test_image_operations.py
	wagtail/images/tests/test_models.py
	wagtail/images/tests/test_signal_handlers.py
	wagtail/images/views/chooser.py
	wagtail/images/views/images.py
	wagtail/images/views/multiple.py
	wagtail/images/wagtail_hooks.py
	wagtail/images/widgets.py
	wagtail/project_template/project_name/settings/base.py
	wagtail/tests/demosite/models.py
	wagtail/tests/non_root_urls.py
	wagtail/tests/settings.py
	wagtail/tests/testapp/migrations/0001_initial.py
	wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py
	wagtail/tests/testapp/migrations/0009_defaultstreampage.py
	wagtail/tests/urls.py
 2017-11-26 22:43:47 +00:00
Karl Hobley
78b1372cd4 Rename wagtail.wagtaildocs to wagtail.documents 
Conflicts:
	docs/advanced_topics/i18n/index.rst
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	gulpfile.js/config.js
	wagtail/admin/tests/test_collections_views.py
	wagtail/api/v2/signal_handlers.py
	wagtail/contrib/wagtailstyleguide/views.py
	wagtail/core/tests/test_collection_permission_policies.py
	wagtail/documents/permissions.py
	wagtail/documents/tests/test_admin_views.py
	wagtail/documents/tests/test_collection_privacy.py
	wagtail/documents/tests/test_models.py
	wagtail/documents/views/chooser.py
	wagtail/documents/views/documents.py
	wagtail/documents/views/serve.py
	wagtail/documents/wagtail_hooks.py
	wagtail/documents/widgets.py
	wagtail/project_template/project_name/urls.py
	wagtail/tests/demosite/models.py
	wagtail/tests/non_root_urls.py
	wagtail/tests/settings.py
	wagtail/tests/testapp/models.py
	wagtail/tests/urls.py
 2017-11-26 22:43:47 +00:00
Bertrand Bordage
420f721631 Tests Travis CI against the PostgreSQL search backend. 2017-11-24 04:05:54 +01:00
Karl Hobley
0a52196c63 Remove ES 1.x from test configuration 2017-11-06 14:27:27 +00:00
Matt Westcott
5a0c36cdae Remove Django 1.8/1.10 from CI and readme 2017-10-11 17:04:06 +01:00
Karl Hobley
4a1e27dbd4 Remove Python 2 from CI and docs 2017-10-11 16:40:10 +01:00
Bertrand Bordage
c577d15f13 Removes Django 1.10 HEAD from test matrix. 2017-04-12 01:42:40 +02:00
Michael van Tellingen
8decb577ce Add appyveyor config (#3505) 
* Add appyveyor config

This commit does add settings for using mssql on appveyor
but there are still some issues with timeouts. For now only
the sqlite build is enabled.

Note that the build currently (correctly) fails on windows

* Fix unittests on Windows (in wagtaildocs)

The document.file.name attribute doesn't contain a valid path separator
on windows. Use document.file.path for comparison instead.
 2017-03-27 13:10:25 +01:00
Kees Hink
a2b9c2bfe4 Document pep8 issues to ignore (#3503) 
* Docs: E501 is not the only PEP8 violation we accept.

* Add the list of PEP8 violations we accept to tox.ini
 2017-03-25 15:10:12 +01:00
Matt Westcott
a98e0d9862 Add Python 3.6 to CI test matrix 2017-03-12 12:52:42 +03:00
Matt Westcott
cc3b826025 fixup! Add Django 1.11b1 to Travis as allow_failures 2017-03-12 12:52:42 +03:00
Matt Westcott
73639938b7 fixup! Add Django 1.11b1 to Travis as allow_failures 2017-03-12 12:52:42 +03:00
Matt Westcott
2f6c88f52b Add Django 1.11b1 to Travis as allow_failures 2017-03-12 12:52:42 +03:00
Matt Westcott
fef8b28089 Drop Django 1.9 and Python 3.3 from CI 
As agreed at https://groups.google.com/d/msg/wagtail-developers/nTn-rthPMsA/ORP3GA-hCQAJ
 2017-02-22 17:39:38 +00:00
Karl Hobley
a1ae5950f4 Install certifi when testing against Elasticsearch 5 
Required by elasticsearch-py but needs to be installed separately

8314f7b25c
 2016-11-30 16:31:21 +00:00
Karl Hobley
752fbca24a Add Elasticsearch 5 to Travis/tox 2016-11-30 16:31:20 +00:00
Matt Westcott
b4a4e5eb92 Pass update_all_types=True to put_mapping on ES2 - workaround for #2968 2016-10-05 13:45:43 +01:00
Matt Westcott
71ce47bc5a Configure Travis to test against the latest Django stable branch on git (#2967) 2016-09-21 12:40:57 +01:00
Karl Hobley
daa82936d7 Elasticsearch 2 support (#2573) 
* Created Elasticsearch 2 backend

* Added tests for Elasticsearch 2 backend

* Split models up into different indices

pages, images and documents are now in separate indices

* Prefix fields of child models to prevent mapping clashes

* Replaced index_analyzer with analyzer/search_analyzer

index_analyzer has been removed in Elasticsearch 2.0

https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking_20_mapping_changes.html#_analyzer_mappings

There's no indication in Elasticsearch's docs that this wouldn't work on Elasticsearch 1.x. However, we found that the new configuration isn't reliable on Elasticsearch 1.6 and below (causes the test_query_analyzer test to fail randomly).

* Implemented new way of representing content types in search index

Instead of using a long string of model names that is queried using a
"prefix" query, we instead use a multi-value string field and query it
using a simple "match" query.

The only reason why this isn't implemented in the Elasticsearch 1.x
backend yet is backwards compatibility

* Added another child model of SearchTest with clashing field mapping

This checks that the namespacing of fields on child models is working properly (if it doesn't the update_index tests will fail)

* Added tests for get_model_root function

* fixup! Added tests for get_model_root function

* Docs updates for Elasticsearch 2 support

Also tweak examples to use elasticsearch2 backend by default

* Test against Elasticsearch 2 on travis
 2016-08-31 13:46:57 +03:00
Matt Westcott
4a1b103558 Make elasticsearch-specific tests from wagtailimages / wagtaildocs run under tox 2016-07-04 20:32:31 +01:00
Matt Westcott
b85c340163 Move flake8 config to setup.cfg 2016-06-23 16:31:44 +01:00
Mikalai Radchuk
408dcbed43 CI configuration for Django 1.10 (#2724) 
Adds Django 1.10a1 into tox.ini

Also adds Django 1.10 into .travis.yaml
 2016-06-17 10:12:53 +01:00
Matt Westcott
f8d7970cbb Remove Jinja2 from tox.ini as it's now in testing_extras (see #2583) 2016-05-17 17:36:29 +01:00
Matt Westcott
3b0c074ba7 Eliminate duplication of dependencies in tox.ini 
Fixes #2317
 2016-05-04 14:12:27 +01:00
Matt Westcott
c495f02baf Make elasticsearch switchable in tox, allow ES failures in travis 2016-05-03 13:54:26 +01:00
Matt Westcott
e06f6acaba Tweak dependencies to allow Willow 0.3b4 to be installed, via either tox or setup.py 2016-03-07 18:29:24 +00:00
Karl Hobley
1565e74101 Willow 0.3 support 2016-03-07 18:29:23 +00:00
Michael van Tellingen
e7ace5c181 Dependency update: Support django-treebeard 3.0 and 4.0 releases 
The admin extensions in django treebeard 3.0 are not compatible with
Django 1.9. Although these are not used by Wagtail they are used in
other projects (e.g. Oscar), so we should allow treebeard 4.0 which
is compatible with Django 1.9.
 2016-03-07 12:33:28 +00:00
Karl Hobley
be82fa975d Removed django-compressor 2016-02-03 16:16:11 +00:00
Matt Westcott
04fdd5f352 Remove Django 1.7 support from documentation, requirements and CI definitions 2016-01-05 17:38:29 +00:00
Karl Hobley
de93b14a08 Temporarily pinned Django versions 
There appears to be a bug in Django 1.9.1/1.8.7 causing the migrations to fail.
 2016-01-04 12:25:26 +00:00
Matt Westcott
84d7666e5c Unpin html5lib version 2015-12-11 13:27:57 +00:00
Matt Westcott
b5dc2696c4 feat(django1.9): Upgrade to django-taggit 0.17.5 (required for Django 1.9 compatibility) 2015-12-09 11:40:35 +00:00
Karl Hobley
b382f89b55 feat(django 1.9): Test on django-modelcluster 1.1 beta 1 2015-12-09 11:40:35 +00:00
Karl Hobley
2b38263fba feat(django 1.9): Added Django 1.9 to tox/travis 2015-12-09 11:40:35 +00:00
Maris Serzans
c92d12755c pep8 compliance 120 characters / line 2015-12-08 14:50:32 +00:00
Karl Hobley
78a5324435 Cleanup E128 errors 2015-12-04 10:00:15 +00:00
Karl Hobley
7175525d02 Cleanup E126 errors 2015-12-04 09:48:20 +00:00
Karl Hobley
6cd293f081 Cleanup E124 errors 2015-12-04 09:42:22 +00:00
Karl Hobley
1957af9ea8 Cleanup E302 errors 2015-12-04 09:32:16 +00:00