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.

Sign up for GitHub

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

Jump to bottom

Upgrade python package dependencies #215

Merged
merged 3 commits into from
Oct 8, 2018
Merged

Upgrade python package dependencies #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
242bc10
Upgrade django and django-filters
dougppaz Oct 8, 2018
b62cecc
Lock version in Pipfile
dougppaz Oct 8, 2018
11386d2
Update setup.py install requires version
dougppaz Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ verify_ssl = true
name = "pypi"

[packages]
django = "==2.0.6"
dj-database-url = "*"
python-decouple = "*"
django = "==2.1.2"
dj-database-url = "==0.5.0"
python-decouple = "==3.1"
djangorestframework = "==3.7.7"
django-filter = "==1.1.0"
django-cors-headers = "*"
requests = "*"
coreapi = "*"
whitenoise = "*"
django-filter = "==2.0.0"
django-cors-headers = "==2.4.0"
requests = "==2.19.1"
coreapi = "==2.3.3"
whitenoise = "==4.1"
pytz = "==2018.5"

[dev-packages]
Expand Down
50 changes: 21 additions & 29 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions bothub/api/tests/test_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ def test_repository_uuid_required(self):
self.owner_token)
self.assertEqual(
response.status_code,
status.HTTP_200_OK)
status.HTTP_400_BAD_REQUEST)
self.assertEqual(
content_data.get('count'),
0)
len(content_data.get('repository_uuid')),
1)

def test_repository_does_not_exist(self):
response, content_data = self.request(
Expand Down
6 changes: 3 additions & 3 deletions bothub/api/tests/test_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ def test_repository_uuid_empty(self):
response, content_data = self.request({}, self.owner_token)
self.assertEqual(
response.status_code,
status.HTTP_200_OK)
status.HTTP_400_BAD_REQUEST)
self.assertEqual(
content_data.get('count'),
0)
len(content_data.get('repository_uuid')),
1)

def test_forbidden(self):
response, content_data = self.request({
Expand Down
22 changes: 11 additions & 11 deletions bothub/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,23 @@ class Meta:
]

repository_uuid = filters.CharFilter(
name='repository_uuid',
field_name='repository_uuid',
method='filter_repository_uuid',
required=True,
help_text=_('Repository\'s UUID'))
language = filters.CharFilter(
name='language',
field_name='language',
method='filter_language',
help_text='Filter by language, default is repository base language')
has_translation = filters.BooleanFilter(
name='has_translation',
field_name='has_translation',
method='filter_has_translation',
help_text=_('Filter for examples with or without translation'))
has_not_translation_to = filters.CharFilter(
name='has_not_translation_to',
field_name='has_not_translation_to',
method='filter_has_not_translation_to')
order_by_translation = filters.CharFilter(
name='order_by_translation',
field_name='order_by_translation',
method='filter_order_by_translation',
help_text=_('Order examples with translation by language'))

Expand Down Expand Up @@ -211,16 +211,16 @@ class Meta:
fields = []

repository_uuid = filters.CharFilter(
name='repository_uuid',
field_name='repository_uuid',
method='filter_repository_uuid',
required=True,
help_text=_('Repository\'s UUID'))
from_language = filters.CharFilter(
name='language',
field_name='language',
method='filter_from_language',
help_text='Filter by original language')
to_language = filters.CharFilter(
name='language',
field_name='language',
method='filter_to_language',
help_text='Filter by translated language')

Expand Down Expand Up @@ -253,7 +253,7 @@ class Meta:
fields = ['repository']

repository = filters.CharFilter(
name='repository',
field_name='repository',
method='filter_repository_uuid',
help_text=_('Repository\'s UUID'))

Expand All @@ -278,7 +278,7 @@ class Meta:
fields = ['repository_uuid']

repository_uuid = filters.CharFilter(
name='repository_uuid',
field_name='repository_uuid',
required=True,
method='filter_repository_uuid',
help_text=_('Repository\'s UUID'))
Expand Down Expand Up @@ -307,7 +307,7 @@ class Meta:
]

repository_uuid = filters.CharFilter(
name='repository_uuid',
field_name='repository_uuid',
required=True,
method='filter_repository_uuid',
help_text=_('Repository\'s UUID'))
Expand Down
16 changes: 8 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
description='bothub',
packages=find_packages(),
install_requires=[
'python-decouple',
'requests',
'django==2.0.6',
'python-decouple==3.1',
'requests==2.19.1',
'django==2.1.2',
'djangorestframework==3.7.7',
'whitenoise',
'dj-database-url',
'django-cors-headers',
'django-filter',
'coreapi',
'whitenoise==4.1',
'dj-database-url==0.5.0',
'django-cors-headers==2.4.0',
'django-filter==2.0.0',
'coreapi==2.3.3',
],
python_requires='>=3.6',
)