Bump to 4.1.1 (#462)

* Bump GeoNode to 4.1.1

* dropped updategeoip task

src/entrypoint.sh

@@ -79,7 +79,6 @@ else
 
         if [ ${FORCE_REINIT} = "true" ]  || [ ${FORCE_REINIT} = "True" ] || [ ! -e "/mnt/volumes/statics/geonode_init.lock" ]; then
             echo "LOG INIT" > /usr/src/{{project_name}}/invoke.log
-            invoke updategeoip
             invoke fixtures
             invoke monitoringfixture
             invoke initialized

src/pavement.py

@@ -298,21 +298,6 @@ def static(options):
         sh('grunt production')
 
 
-@task
-@needs([
-    'setup_geoserver',
-])
-def setup(options):
-    """Get dependencies and prepare a GeoNode development environment."""
-
-    if MONITORING_ENABLED:
-        updategeoip(options)
-
-    info('GeoNode development environment successfully set up.'
-         'If you have not set up an administrative account,'
-         ' please do so now. Use "paver start" to start up the server.')
-
-
 def grab_winfiles(url, dest, packagename):
     # Add headers
     headers = {'User-Agent': 'Mozilla 5.10'}
@@ -377,22 +362,6 @@ def upgradedb(options):
         print(f"Upgrades from version {version} are not yet supported.")
 
 
-@task
-@cmdopts([
-    ('settings=', 's', 'Specify custom DJANGO_SETTINGS_MODULE')
-])
-def updategeoip(options):
-    """
-    Update geoip db
-    """
-    if MONITORING_ENABLED:
-        settings = options.get('settings', '')
-        if settings and 'DJANGO_SETTINGS_MODULE' not in settings:
-            settings = f'DJANGO_SETTINGS_MODULE={settings}'
-
-        sh(f"{settings} python -W ignore manage.py updategeoip -o")
-
-
 @task
 @cmdopts([
     ('settings=', 's', 'Specify custom DJANGO_SETTINGS_MODULE')

src/requirements.txt

@@ -1 +1 @@
-git+https://github.com/GeoNode/geonode.git@4.1.x#egg=GeoNode
+GeoNode==4.1.1

src/tasks.py

@@ -275,13 +275,6 @@ def monitoringfixture(ctx):
         logger.error(f"ERROR installing monitoring fixture: {str(e)}")
 
 
-@task
-def updategeoip(ctx):
-    print("**************************update geoip*******************************")
-    if ast.literal_eval(os.environ.get('MONITORING_ENABLED', 'False')):
-        ctx.run(f"django-admin.py updategeoip --settings={_localsettings()}", pty=True)
-
-
 @task
 def updateadmin(ctx):
     print("***********************update admin details**************************")