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.

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

Upgrade the stack from Django 2.2 to 3.2 #233

Merged
merged 3 commits into from
Aug 21, 2022

Conversation

Gustry
Copy link
Contributor

@Gustry Gustry commented Jan 8, 2022

Related to #225 about the Django version

@dimasciput I made a PR on your fork to update "feedjack".

For Python version, I have raised a ticket on kartoza/docker-django-base

@sumandari If you develop some bugfix/features it would be nice to try this branch just in case, what do you think ?

@codecov-commenter
Copy link

codecov-commenter commented Jan 8, 2022

Codecov Report

Merging #233 (29bf0e5) into master (3c12f2c) will increase coverage by 34.82%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #233       +/-   ##
===========================================
+ Coverage   37.55%   72.37%   +34.82%     
===========================================
  Files          83      124       +41     
  Lines        3635     4626      +991     
===========================================
+ Hits         1365     3348     +1983     
+ Misses       2270     1278      -992     
Impacted Files Coverage Δ
qgis-app/plugins/urls.py 100.00% <0.00%> (ø)
qgis-app/wavefronts/apps.py 100.00% <0.00%> (ø)
qgis-app/layerdefinitions/forms.py 100.00% <0.00%> (ø)
qgis-app/styles/views.py 65.00% <0.00%> (ø)
qgis-app/api/views.py 96.00% <0.00%> (ø)
qgis-app/wavefronts/utilities.py 94.11% <0.00%> (ø)
qgis-app/wavefronts/urls.py 100.00% <0.00%> (ø)
qgis-app/custom_haystack_urls.py 44.44% <0.00%> (ø)
qgis-app/layerdefinitions/urls.py 100.00% <0.00%> (ø)
qgis-app/styles/templatetags/styles_custom_tags.py 21.05% <0.00%> (ø)
... and 60 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3c12f2c...29bf0e5. Read the comment docs.

@sumandari
Copy link
Collaborator

Thanks @Gustry, yes sure. I will rebase my draft PR #230 to this branch and test it. And also maybe I will test it to my older PRs

@sumandari If you develop some bugfix/features it would be nice to try this branch just in case, what do you think ?

@Gustry
Copy link
Contributor Author

Gustry commented Jan 10, 2022

Thanks @sumandari I have updated the PR with the latest commits and @dimasciput merged my PR in his repository for feedjack.

If you are trying this branch, I will not rebase it.

@sumandari
Copy link
Collaborator

@Gustry please do change if any, I will try it after.

@Gustry Gustry mentioned this pull request Aug 21, 2022
@dimasciput dimasciput marked this pull request as ready for review August 21, 2022 13:29
@dimasciput dimasciput changed the base branch from master to update_stacks August 21, 2022 13:30
@dimasciput dimasciput merged commit f7a37c6 into qgis:update_stacks Aug 21, 2022
@Gustry Gustry deleted the django_3_2 branch August 21, 2022 13:51
dimasciput added a commit that referenced this pull request May 6, 2024
* Upgrade the stack from Django 2.2 to 3.2 (#233)

* Upgrade the stack from Django 2.2 to 3.2

* Upgrade pip as well when installing

Co-authored-by: Dimas Ciputra <[email protected]>

* Update docker compose (#256)

* Fix min_qg_version query in plugins.xml (#224)

* fix min_qg_version query

* added 0 patch value for qgis version against max_qg_version

* only add patch if it has major.minor version

* Update docker-compose and dockerfile

* Update nginx configuration

* Update smtp

* Add celery beat

* Add feedjack update celery task

* Add metabase configuration

* Update test.yaml

* Add test docker-compose

Co-authored-by: sumandari <[email protected]>

* Fix docker-compose and dockerfile

* Init starting docker dev environment

* Fixing docker container conflict, updating whoosh

* Update testfiles and feedback test

* Update dockerfile for dev and prod

* Use main branch for whoosh in requirements

* Django 4 update: Requirements, dockerfile and docker-compose

* Django 4 update: fixes for ifequal, ugettext_lazy, django.conf.urls.url occurences

* Django 4 update: Fix deprecated readfp

* Django 4 update: update dbrestore in Makefile

* Django 4 update: Get static, media and backup volumes from the environment variable

* Django 4 update: Use solr thumbnail default engine

* Django 4 update: Fix Django warnings

* Django 4 update: fix depecated tests, new migrations

* Django 4 update: Update django unit tests

* Django 4 update: Add email environment variables

* Django 4 update: Nginx and uwsgi updates

* Django 4 update: Refactoring dockerfile

* Update makefile to use new docker compose

* Django 4 update: Specify devweb container_name, fix typo

* Use existing nginx configuration

* Add DEFAULT_PLUGINS_SITE to environment variables

* Add nginx dev and prod configuration files

* Django 4 update: Generate a .env file in GH actions

* Django 4 update: Fix typo in Makefile

* Django 4 update: Use updated docker compose in test.yaml

* Django 4 update: Certbot service and SSL configuration

* Add a http configuration for Nginx

* Django 4 update: add SSL cert renewal script

* Redirect http to https

---------

Co-authored-by: Étienne Trimaille <[email protected]>
Co-authored-by: Dimas Ciputra <[email protected]>
Co-authored-by: sumandari <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants