Skip to content
This repository has been archived by the owner on Jan 26, 2021. It is now read-only.

Commit

Permalink
update commits
Browse files Browse the repository at this point in the history
  • Loading branch information
satya7289 committed Jul 21, 2020
1 parent 67a0fde commit b73d097
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 54 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: true
language: python
dist: bionic
env:
- MOZ_HEADLESS=1

Expand All @@ -11,6 +12,8 @@ services:

python:
- "3.6"
- "3.7"

before_install:
- wget https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
- tar -xzvf geckodriver-v0.20.1-linux64.tar.gz
Expand Down Expand Up @@ -44,4 +47,4 @@ notifications:
on_failure: always
on_start: false
after_success:
coveralls --rcfile=.coveragerc
coveralls --rcfile=.coveragerc
26 changes: 13 additions & 13 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
-r prod.txt
Sphinx==1.6.5
coverage==4.4.1
django-nose==1.4.5
flake8==2.4.1
sphinx-rtd-theme==0.2.4
pylint==1.9.0
pytest==3.5.1
pytest-cov==2.5.1
pytest-django==3.2.1
pytest-pylint==0.9.0
selenium==3.12.0
Sphinx==3.1.2
coverage==5.2
django-nose==1.4.6
flake8==3.8.3
sphinx-rtd-theme==0.5.0
pylint==2.5.3
pytest==5.4.3
pytest-cov==2.10.0
pytest-django==3.9.0
pytest-pylint==0.17.0
selenium==3.141.0
djangorestframework==3.11.0
geopy==1.15.0
pinax-notifications==6.0.0
geopy==2.0.0
pinax-notifications==6.0.0
7 changes: 3 additions & 4 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ django-cities-light==3.6.0
django-ckeditor==5.9.0
django-crispy-forms==1.9.2
django-guardian==2.3.0
django-imagekit==4.0.1
django-imagekit==4.0.2
psycopg2==2.7.3.2
python3-openid==3.1.0
python3-openid==3.2.0
geoip2==3.0.0
django-ipware==3.0.0

django-ipware==3.0.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[flake8]
ignore = F403
ignore = F403, F405
exclude = .git,docs/*,systers_portal/manage.py,wsgi.py,migrations
max-line-length = 100
1 change: 1 addition & 0 deletions systers_portal/community/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def save_model(self, request, obj, form, change):
form.cleaned_data['members'] = members
super(CommunityAdmin, self).save_model(request, obj, form, change)


admin.site.register(RequestCommunity)
admin.site.register(Community, CommunityAdmin)
admin.site.register(CommunityPage)
32 changes: 0 additions & 32 deletions systers_portal/community/tests/test_context_processors.py

This file was deleted.

4 changes: 2 additions & 2 deletions systers_portal/meetup/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
AddSupportRequestCommentView.as_view(),
name="add_support_request_comment"),
url(r'^(?P<meetup_slug>[\w-]+)/support_request/(?P<pk>\d+)/edit_comment/'
'(?P<comment_pk>\d+)/$',
r'(?P<comment_pk>\d+)/$',
EditSupportRequestCommentView.as_view(),
name="edit_support_request_comment"),
url(r'^(?P<meetup_slug>[\w-]+)/support_request/(?P<pk>\d+)/delete_comment/'
'(?P<comment_pk>\d+)/$',
r'(?P<comment_pk>\d+)/$',
DeleteSupportRequestCommentView.as_view(),
name="delete_support_request_comment"),
url(r'^(?P<slug>[\w-]+)/$', MeetupView.as_view(), name="view_meetup"),
Expand Down
2 changes: 1 addition & 1 deletion systers_portal/meetup/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ def post(self, request):
unit = ''
for meetup in searched_meetups:
distance = ''
geolocator = Nominatim(timeout=6)
geolocator = Nominatim(user_agent="Anita-B Portal", timeout=6)
g = GeoIP2()
if location == "Current Location":
client_ip, is_routable = get_client_ip(request)
Expand Down

0 comments on commit b73d097

Please sign in to comment.