Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis: unbork #183

Merged
merged 3 commits into from
May 12, 2019
Merged

travis: unbork #183

merged 3 commits into from
May 12, 2019

Conversation

greut
Copy link
Collaborator

@greut greut commented May 11, 2019

'django-haystack>=2.5.0',
'djangorestframework>=3.3.2',
'django-haystack>=2.7',
'djangorestframework>=3.8',
'Markdown>=2.6.6',
'polib>=1.0.7',
'Whoosh>=2.7.4',
Copy link
Owner

@batiste batiste May 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff --git a/setup.py b/setup.py
index f3f5ae9..064c51e 100644
--- a/setup.py
+++ b/setup.py
@@ -43,17 +43,17 @@ download_url = url_schema % (package_name, package_name, pages.__version__)

 install_requires = [
     'Django>=2.1.3,<3',
-    'django-mptt>=0.8.3',
-    'django-taggit>=0.18.1',
-    'Pillow>=3.2.0',
+    'django-mptt>=0.10.0',
+    'django-taggit>=1.1.0',
+    'Pillow>=3.4.0',
     'requests>=2.9.0',
     'tqdm>=4.4.1',
 ]

 extra = [
     'django-ckeditor>=5.0.3',
-    'django-haystack>=2.5.0',
-    'djangorestframework>=3.3.2',
+    'django-haystack>=2.8.0',
+    'djangorestframework>=3.9.4',
     'Markdown>=2.6.6',
     'polib>=1.0.7',
     'Whoosh>=2.7.4',

@greut greut marked this pull request as ready for review May 12, 2019 10:20
greut added 3 commits May 12, 2019 13:15
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
@greut
Copy link
Collaborator Author

greut commented May 12, 2019

@batiste to get it working with 2.2, you'll have to fix your tests.

DiscoverRunner now skips the setup of databases not referenced by tests.

https://docs.djangoproject.com/en/2.2/releases/2.2/#tests

@batiste batiste merged commit 90c16d1 into batiste:master May 12, 2019
@greut greut deleted the sudo-false branch May 13, 2019 05:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants