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

Refactor to use cplus core package #69

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Refactor to use cplus core package #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b0c840
use core package for ScenarioAnalysisTask
danangmassandy Sep 12, 2024
50c8df4
fix lint and update docstring
danangmassandy Sep 12, 2024
6703ff2
Merge branch 'main' into refactor-core-package
danangmassandy Sep 13, 2024
2629de4
remove log
danangmassandy Sep 13, 2024
56c29b3
fix activities in scenario
danangmassandy Sep 13, 2024
b8d48f7
Update CPLUS core version
zamuzakki Oct 7, 2024
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
4 changes: 2 additions & 2 deletions deployment/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update -y && \
python3-dev python3-gdal python3-psycopg2 python3-ldap \
python3-pip python3-pil python3-lxml python3-pylibmc \
uwsgi uwsgi-plugin-python3 wget \
gnupg software-properties-common
gnupg software-properties-common git

# qgis python3-qgis qgis-plugin-grass
RUN mkdir -m755 -p /etc/apt/keyrings
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN groupadd --gid $USER_GID $USERNAME \
# ********************************************************
# * Anything else you want to do like clean up goes here *
# ********************************************************
RUN apt-get update && apt-get install -y git gnupg2 openssh-client
RUN apt-get update && apt-get install -y gnupg2 openssh-client

# [Optional] Set the default user. Omit if you want to keep the default as root.
USER $USERNAME
Expand Down
5 changes: 4 additions & 1 deletion deployment/docker/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,7 @@ flower==1.2.0
django-revproxy @ https://github.com/jazzband/django-revproxy/archive/refs/tags/0.11.0.zip

# For getting raster metadata
rasterio==1.3.10
rasterio==1.3.10

# cplus core
git+https://github.com/kartoza/cplus-core.git@v0.0.4
1 change: 0 additions & 1 deletion django_project/core/settings/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
# Extra installed apps
INSTALLED_APPS = INSTALLED_APPS + (
'core',
'cplus',
'cplus_api'
)

Expand Down
Empty file removed django_project/cplus/__init__.py
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion django_project/cplus/admin.py
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions django_project/cplus/apps.py
View file
Open in desktop

This file was deleted.

334 changes: 0 additions & 334 deletions django_project/cplus/data/default/activities.json
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions django_project/cplus/data/default/ncs_pathways.json
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions django_project/cplus/data/default/priority_weighting_layers.json
View file
Open in desktop

This file was deleted.

Binary file removed django_project/cplus/data/layers/null_raster.tif
View file
Open in desktop
Binary file not shown.
Loading
Loading