From 1770683b5929581524a4f5dbeea3d1ed2cfb35a5 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 30 Nov 2021 12:27:50 -0600 Subject: [PATCH 1/8] TACC: Comment where to install TACC plugins --- backend/settings.py | 3 +++ requirements.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/backend/settings.py b/backend/settings.py index eaf6fb24..f26a6959 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -78,6 +78,9 @@ 'djangocms_bootstrap4.contrib.bootstrap4_picture', 'djangocms_bootstrap4.contrib.bootstrap4_tabs', 'djangocms_bootstrap4.contrib.bootstrap4_utilities', + + # standard TACC CMS plugins + # 'djangocms_tacc_…', ] MIDDLEWARE = [ diff --git a/requirements.in b/requirements.in index a98528dd..cfcf3585 100644 --- a/requirements.in +++ b/requirements.in @@ -41,6 +41,9 @@ djangocms-bootstrap4>=2.0,<3.0 # as of Q4 2021 there are still basic issues with djangocms-bootstrap5 # https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 +# standard TACC CMS plugins +# git+http://git@github.com/TACC/Core-CMS-Plugin-….git#egg=djangocms-tacc-… + # Django Filer - optional, but used in most projects (alpha) https://github.com/django-cms/django-filer/archive/refs/tags/2.1.1.zip#egg=django-filer From df20ef16265b45a870b5a7967f07a3ea652cc0c9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 30 Nov 2021 12:55:43 -0600 Subject: [PATCH 2/8] TACC: Add pull request template for plugin review --- .github/PULL_REQUEST_TEMPLATE/plugin_review.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/plugin_review.md diff --git a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md new file mode 100644 index 00000000..f657f053 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md @@ -0,0 +1,11 @@ +### Overview + +Proof of concept installation of TACC-specific plugin for Django CMS. + +### Plugin + +https://github.com/TACC/Core-CMS-Plugin-… + +### Notes + +The `main` branch has [minimal changes from the original](https://github.com/django-cms/django-cms-quickstart/compare/main...tacc-wbomar:main) remote https://github.com/django-cms/django-cms-quickstart. From c32899a067587f4f2dd505377978368f92f82a9c Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 30 Nov 2021 13:24:30 -0600 Subject: [PATCH 3/8] TACC: Tweak added pull request template --- .github/PULL_REQUEST_TEMPLATE/plugin_review.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md index f657f053..e6db8c96 100644 --- a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md +++ b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md @@ -1,3 +1,10 @@ +
+Notice + +The `main` branch has [some changes from the original remote](https://github.com/django-cms/django-cms-quickstart/compare/main...tacc-wbomar:main). + +
+ ### Overview Proof of concept installation of TACC-specific plugin for Django CMS. @@ -5,7 +12,3 @@ Proof of concept installation of TACC-specific plugin for Django CMS. ### Plugin https://github.com/TACC/Core-CMS-Plugin-… - -### Notes - -The `main` branch has [minimal changes from the original](https://github.com/django-cms/django-cms-quickstart/compare/main...tacc-wbomar:main) remote https://github.com/django-cms/django-cms-quickstart. From 20b3876c51f3bce0a03aacec4a95a11afab51736 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 30 Nov 2021 16:59:19 -0600 Subject: [PATCH 4/8] TACC: Improve the one pull request template --- .github/PULL_REQUEST_TEMPLATE/plugin_review.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md index e6db8c96..b4d4459e 100644 --- a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md +++ b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md @@ -3,12 +3,21 @@ The `main` branch has [some changes from the original remote](https://github.com/django-cms/django-cms-quickstart/compare/main...tacc-wbomar:main). + +
+For PR Author + +Replace all instances of "____" with the name of your plugin. +
### Overview -Proof of concept installation of TACC-specific plugin for Django CMS. +TACC-specific plugin for Django CMS: Core-CMS-Plugin-_____ -### Plugin +### Testing Steps -https://github.com/TACC/Core-CMS-Plugin-… +1. Checkout this PR's branch. +2. Follow [How to Test Plugin](https://github.com/tacc-wbomar/django-cms-quickstart/wiki/How-to-Test-Plugin). +3. Test plugin Usage & Features: + https://github.com/TACC/Core-CMS-Plugin-_____#usage From 9c721764e470dbfa21a8f1a6bc49a9270b0f1008 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 30 Nov 2021 17:13:42 -0600 Subject: [PATCH 5/8] TACC: Add "Issue" to the pull request template --- .github/PULL_REQUEST_TEMPLATE/plugin_review.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md index b4d4459e..dbf5da05 100644 --- a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md +++ b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md @@ -7,7 +7,9 @@ The `main` branch has [some changes from the original remote](https://github.com
For PR Author -Replace all instances of "____" with the name of your plugin. +Replace __all__ instances of "____" with the name of your plugin. + +Replace __all__ instances of "0000" with the ID of the JIRA issue.
@@ -15,6 +17,10 @@ Replace all instances of "____" with the name of your plugin. TACC-specific plugin for Django CMS: Core-CMS-Plugin-_____ +### Issue + +[FP-0000](https://jira.tacc.utexas.edu/browse/FP-0000) + ### Testing Steps 1. Checkout this PR's branch. From 4876d22abf41f935d195707eba0b08927e4927ae Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 8 Jun 2023 14:15:51 -0500 Subject: [PATCH 6/8] fix(requirements): pip-compile command fails pip-compile --output-file=requirements.txt requirements.in --- requirements.in | 2 +- requirements.txt | 80 +++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/requirements.in b/requirements.in index 6020fedf..43c41780 100644 --- a/requirements.in +++ b/requirements.in @@ -8,7 +8,7 @@ django-storage-url==0.5.0 whitenoise==5.2.0 boto3==1.14.49 -psycopg2==2.8.5 +psycopg2-binary==2.9.6 uwsgi==2.0.19.1 diff --git a/requirements.txt b/requirements.txt index e71ba401..69bf8896 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # # pip-compile --output-file=requirements.txt requirements.in # -asgiref==3.5.2 +asgiref==3.7.2 # via django boto3==1.14.49 # via -r requirements.in @@ -12,7 +12,7 @@ botocore==1.17.63 # via # boto3 # s3transfer -build==0.8.0 +build==0.10.0 # via pip-tools click==8.1.3 # via pip-tools @@ -39,12 +39,12 @@ django==3.2 # easy-thumbnails django-appconf==1.0.5 # via django-select2 -django-classy-tags==3.0.1 +django-classy-tags==4.0.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==3.11.0 +django-cms==3.11.3 # via # -r requirements.in # djangocms-attributes-field @@ -56,42 +56,40 @@ django-cms==3.11.0 # djangocms-style # djangocms-text-ckeditor # djangocms-video -django-entangled==0.4 +django-entangled==0.5.4 # via djangocms-frontend -django-filer==2.2.3 +django-filer==2.2.4 # via # djangocms-file # djangocms-frontend # djangocms-googlemap # djangocms-picture # djangocms-video -django-formtools==2.3 +django-formtools==2.4.1 # via django-cms django-js-asset==2.0.0 # via django-mptt -django-mptt==0.13.4 +django-mptt==0.14.0 # via django-filer django-polymorphic==3.1.0 # via django-filer -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms -django-select2==7.10.1 +django-select2==8.1.2 # via djangocms-frontend django-storage-url==0.5.0 # via -r requirements.in -django-storages==1.13.1 +django-storages==1.13.2 # via django-storage-url -django-treebeard==4.4 - # via - # django-cms - # djangocms-attributes-field -djangocms-admin-style==3.2.0 +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.4 # via # -r requirements.in # django-cms -djangocms-attributes-field==2.1.0 +djangocms-attributes-field==3.0.0 # via # djangocms-file # djangocms-frontend @@ -101,7 +99,7 @@ djangocms-attributes-field==2.1.0 # djangocms-video djangocms-file==3.0.0 # via -r requirements.in -djangocms-frontend==1.0.0 +djangocms-frontend==1.1.4 # via -r requirements.in djangocms-googlemap==2.0.0 # via -r requirements.in @@ -111,7 +109,7 @@ djangocms-picture==3.0.0 # via -r requirements.in djangocms-style==3.0.0 # via -r requirements.in -djangocms-text-ckeditor==5.1.1 +djangocms-text-ckeditor==5.1.2 # via # -r requirements.in # djangocms-frontend @@ -119,10 +117,11 @@ djangocms-video==3.0.0 # via -r requirements.in docutils==0.15.2 # via botocore -easy-thumbnails[svg]==2.8.3 +easy-thumbnails[svg]==2.8.5 # via # -r requirements.in # django-filer + # djangocms-frontend # djangocms-picture furl==2.1.3 # via django-storage-url @@ -132,32 +131,33 @@ jmespath==0.10.0 # via # boto3 # botocore -lxml==4.9.1 +lxml==4.9.2 # via svglib orderedmultidict==1.0.1 # via furl -packaging==21.3 - # via build -pep517==0.13.0 - # via build -pillow==9.2.0 +packaging==23.1 + # via + # build + # django-cms + # djangocms-text-ckeditor +pillow==9.5.0 # via # djangocms-text-ckeditor # easy-thumbnails # reportlab -pip-tools==6.8.0 +pip-tools==6.13.0 # via -r requirements.in -psycopg2==2.8.5 +psycopg2-binary==2.9.6 # via -r requirements.in -pyparsing==3.0.9 - # via packaging +pyproject-hooks==1.0.0 + # via build python-dateutil==2.8.2 # via botocore -pytz==2022.2.1 +pytz==2023.3 # via # -r requirements.in # django -reportlab==3.6.11 +reportlab==4.0.4 # via # easy-thumbnails # svglib @@ -169,18 +169,14 @@ six==1.16.0 # html5lib # orderedmultidict # python-dateutil -sqlparse==0.4.2 +sqlparse==0.4.4 # via django -svglib==1.4.1 +svglib==1.5.1 # via easy-thumbnails -tinycss2==1.1.1 +tinycss2==1.2.1 # via # cssselect2 # svglib -tomli==2.0.1 - # via - # build - # pep517 unidecode==1.1.2 # via django-filer urllib3==1.25.11 @@ -192,7 +188,7 @@ webencodings==0.5.1 # cssselect2 # html5lib # tinycss2 -wheel==0.37.1 +wheel==0.40.0 # via pip-tools whitenoise==5.2.0 # via -r requirements.in From 2057171d1b4b5f732fad8b420cb757aaff33d8a5 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 8 Jun 2023 14:32:03 -0500 Subject: [PATCH 7/8] conf(.github): tacc-wbomar to wesleyboar --- .github/PULL_REQUEST_TEMPLATE/plugin_review.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md index dbf5da05..35c57558 100644 --- a/.github/PULL_REQUEST_TEMPLATE/plugin_review.md +++ b/.github/PULL_REQUEST_TEMPLATE/plugin_review.md @@ -1,7 +1,7 @@
Notice -The `main` branch has [some changes from the original remote](https://github.com/django-cms/django-cms-quickstart/compare/main...tacc-wbomar:main). +The `main` branch has [some changes from the original remote](https://github.com/django-cms/django-cms-quickstart/compare/main...wesleyboar:main).
@@ -24,6 +24,6 @@ TACC-specific plugin for Django CMS: Core-CMS-Plugin-_____ ### Testing Steps 1. Checkout this PR's branch. -2. Follow [How to Test Plugin](https://github.com/tacc-wbomar/django-cms-quickstart/wiki/How-to-Test-Plugin). +2. Follow [How to Test Plugin](https://github.com/wesleyboar/django-cms-quickstart/wiki/How-to-Test-Plugin). 3. Test plugin Usage & Features: https://github.com/TACC/Core-CMS-Plugin-_____#usage From 89fba2833a375ee95d405f95351399016aa6fc79 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 8 Jun 2023 14:46:21 -0500 Subject: [PATCH 8/8] test: install djangocms_tacc_image_gallery --- backend/settings.py | 1 + requirements.in | 1 + requirements.txt | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/settings.py b/backend/settings.py index 3ad0513a..e3de65d8 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -81,6 +81,7 @@ # standard TACC CMS plugins # 'djangocms_tacc_…', + 'djangocms_tacc_image_gallery', ] MIDDLEWARE = [ diff --git a/requirements.in b/requirements.in index 43c41780..2544e84d 100644 --- a/requirements.in +++ b/requirements.in @@ -39,6 +39,7 @@ djangocms-frontend # standard TACC CMS plugins # git+http://git@github.com/TACC/Core-CMS-Plugin-….git#egg=djangocms-tacc-… +git+http://git@github.com/wesleyboar/Core-CMS-Plugin-Image-Gallery.git@5db5ac4#egg=djangocms-tacc-image-gallery # Django Filer - optional, but used in most projects (alpha) - already implicitly installed through djangocms-file # https://github.com/django-cms/django-filer/archive/refs/tags/2.1.1.zip#egg=django-filer diff --git a/requirements.txt b/requirements.txt index 69bf8896..44859d1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --output-file=requirements.txt requirements.in +# pip-compile requirements.in # asgiref==3.7.2 # via django @@ -36,6 +36,7 @@ django==3.2 # django-storages # django-treebeard # djangocms-frontend + # djangocms-tacc-image-gallery # easy-thumbnails django-appconf==1.0.5 # via django-select2 @@ -54,6 +55,7 @@ django-cms==3.11.3 # djangocms-icon # djangocms-picture # djangocms-style + # djangocms-tacc-image-gallery # djangocms-text-ckeditor # djangocms-video django-entangled==0.5.4 @@ -109,6 +111,8 @@ djangocms-picture==3.0.0 # via -r requirements.in djangocms-style==3.0.0 # via -r requirements.in +djangocms-tacc-image-gallery @ git+http://git@github.com/wesleyboar/Core-CMS-Plugin-Image-Gallery.git@5db5ac4 + # via -r requirements.in djangocms-text-ckeditor==5.1.2 # via # -r requirements.in