Merge branch 'develop' into 536

.travis.yml

@@ -20,7 +20,10 @@ install:
   - pip install coveralls==0.4.4
   - sudo apt-get install python-gdal
 before_script:
+  - export GOOGLE_MAPS_API_KEY=$GOOGLE_MAPS_API_KEY
   - export SECRET_KEY=foobarbaz
+#  - curl -o ipdb.tar.gz https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=$MAXMIND_LICENSE_KEY&suffix=tar.gz
+#  - tar -xzf ipdb.tar.gz -C systers_portal/
   - psql -c "CREATE DATABASE systersdb;" -U postgres
 script:
   - coverage run systers_portal/manage.py test --settings=systers_portal.settings.testing

README.md

@@ -37,7 +37,9 @@ Setup for developers (Unix)
      $ pip install -r requirements/dev.txt
      $ sudo apt-get install python-gdal
      ```
-7. Create `systersdb` database, where `systersdb` might be any suitable name.
+
+7.  Create `systersdb` database, where `systersdb` might be any suitable name [Password should not be empty].
+
     ```
     $ sudo -i -u postgres
     $ createuser <any name e.g. alice> --pwprompt
@@ -183,3 +185,9 @@ For more information on semantics and builds, please refer to the Sphinx
 [official documentation](http://sphinx-doc.org/contents.html).
 
 You can view the requirements document [here](docs/requirements/Systers_GSoC14_Portal_Requirements.pdf).
+
+
+Contact
+-------
+
+You can reach the maintainers and our community on [AnitaB.org Open Source Zulip](https://anitab-org.zulipchat.com/). If you are interested in contributing to portal, we have a dedicated stream for this project [#portal](https://anitab-org.zulipchat.com/#narrow/stream/222540-portal), where you can ask questions and interact with the community, join with us!

requirements/prod.txt

@@ -1,4 +1,4 @@
-Django==1.11.6
+Django==1.11.29
 Pillow==4.3.0
 django-allauth==0.33.0
 django-braces==1.11.0
@@ -7,6 +7,8 @@ django-ckeditor==5.3.1
 django-crispy-forms==1.7.0
 django-guardian==1.4.9
 django-imagekit==4.0.1
-djangocms-admin-style==1.2.7
 psycopg2==2.7.3.2
 python3-openid==3.1.0
+geoip2==3.0.0
+django-ipware==3.0.0
+

systers_portal/GeoLite2-City_20200616/COPYRIGHT.txt

@@ -0,0 +1 @@
+Database and Contents Copyright (c) 2020 MaxMind, Inc.

systers_portal/GeoLite2-City_20200616/LICENSE.txt

@@ -0,0 +1,3 @@
+Use of this MaxMind product is governed by MaxMind's GeoLite2 End User License Agreement, which can be viewed at https://www.maxmind.com/en/geolite2/eula.
+
+This database incorporates GeoNames [https://www.geonames.org] geographical data, which is made available under the Creative Commons Attribution 4.0 License. To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/.

systers_portal/GeoLite2-City_20200616/README.txt

@@ -0,0 +1 @@
+Latitude and longitude are not precise and should not be used to identify a particular street address or household.

systers_portal/blog/tests/test_forms.py

@@ -1,3 +1,4 @@
+from cities_light.models import Country, City
 from django.contrib.auth.models import User
 from django.test import TestCase
 
@@ -12,8 +13,11 @@ class AddNewsFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_add_news_form(self):
@@ -41,8 +45,11 @@ class EditNewsFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_edit_news_form(self):
@@ -73,8 +80,11 @@ class AddResourceFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_add_resource_form(self):
@@ -102,8 +112,11 @@ class EditResourceFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_edit_news_form(self):
@@ -134,8 +147,11 @@ class TagFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_tag_form(self):
@@ -160,8 +176,11 @@ class ResourceTypeFormTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_resourceType_form(self):

systers_portal/blog/tests/test_mixins.py

@@ -1,3 +1,4 @@
+from cities_light.models import Country, City
 from django.contrib.auth.models import User
 from django.test import TestCase, RequestFactory
 from django.views.generic import TemplateView
@@ -13,8 +14,11 @@ def setUp(self):
         self.factory = RequestFactory()
         self.user = User.objects.create_user(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                            country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_get_context_data_empty(self):

systers_portal/blog/tests/test_models.py

@@ -1,3 +1,4 @@
+from cities_light.models import Country, City
 from django.test import TestCase
 from django.contrib.auth.models import User
 
@@ -24,8 +25,11 @@ class NewsModelTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_str(self):
@@ -41,8 +45,11 @@ class ResourceModelTestCase(TestCase):
     def setUp(self):
         self.user = User.objects.create(username='foo', password='foobar')
         self.systers_user = SystersUser.objects.get(user=self.user)
+        country = Country.objects.create(name='Bar', continent='AS')
+        location = City.objects.create(name='Foo', display_name='Foo',
+                                       country=country)
         self.community = Community.objects.create(name="Foo", slug="foo",
-                                                  order=1,
+                                                  order=1, location=location,
                                                   admin=self.systers_user)
 
     def test_unicode(self):