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

Bump to 4.1.1 #461

Closed
wants to merge 2 commits into from
Closed

Bump to 4.1.1 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
138994e
Bump GeoNode to 4.1.1
giohappy Aug 8, 2023
3d8589d
dropped updategeoip task
giohappy Aug 8, 2023
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
1 change: 0 additions & 1 deletion src/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 0 additions & 31 deletions src/pavement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GeoNode==4.1.0
GeoNode==4.1.1
7 changes: 0 additions & 7 deletions src/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**************************")
Expand Down