4.0.0

openplans · Feb 12, 2023 · 2248997 · 2248997
1 parent d0ec989
commit 2248997
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 Copy the following template when creating a new version entry:
 
-2.X.x
+Development (master)
 -----------------------------
   * Bug Fixes:
     - ...
@@ -11,10 +11,81 @@ Copy the following template when creating a new version entry:
   * Upgrade Steps:
     - ...
 
+4.0.0
+-----------------------------
+  * New Features:
+    - Updated to Django 3.2
+    - Support patching in model sync -- This makes it possible to modify the visibility of an idea, even when it 
+has a logged-in submitter.
+    - A few tests -- The Shareabouts client has been woefully light on tests, which has made me squeamish about major updates in the past. Trying to not let that hold the project back in the future.
+
+  * Upgrade Steps:
+    - The Shareabouts configuration should be backwards-compatible with 3.26.1, with the exception of any Django settings that may be in a local_settings.py file. If you have any settings in that file that aren't specific to Shareabouts, please refer to the appropriate Django release notes.
 
-Development (master)
+3.26.1
+-----------------------------
+  * Changes:
+    - Style moderation button similarly to other buttons
+
+3.26.0
+-----------------------------
+  * Changes:
+    - Allow overriding config parameters with environment variables
+
+      The majority of the configuration values in *config.yml* can be overridden
+      with environment variables. You can determine what the environment
+      variable to override a setting should be called by joining the setting's
+      path with double underscores, converting to uppercase, and prepending with
+      `SHAREABOUTS__`. For example, say you have the configuration options:
+
+      ```yml
+      place:
+        adding_supported:
+          from: 2017-03-07 09:00 -0500
+          until: 2017-04-04 09:00 -0400
+      ```
+
+      You could override these settings with the two env variables:
+
+      ```
+      SHAREABOUTS__PLACE__ADDING_SUPPORTED__FROM = 2017-03-07 09:00 -0500
+      SHAREABOUTS__PLACE__ADDING_SUPPORTED__UNTIL = 2017-04-04 09:00 -0400
+      ```
+
+    - Allow hiding/showing places and comments with appropriate permissions.
+
+      The following handlebars helpers can be used to check the current user's
+      permissions:
+
+      - `{{# can_add_places }}` -- Checks whether adding is supported or the
+        current user is in a `place.editors` group.
+      - `{{# can_moderate_places }}` -- Checks whether the current user is in a
+        `place.moderators` group. Moderators can show or hide places.
+      - `{{# can_edit_places }}` -- Checks whether the current user is in a
+        `place.editors` group. Editors can change the content of places, and
+        add places outside of the adding supported time.
+
+      When `can_add_places` is true, the add button show up on the interface.
+      When `can_edit_places` or `can_moderate_places` is true, a control bar with
+      show/hide and delete buttons is available on each place detail page.
+
+3.25.0
+-----------------------------
+  * Changes:
+    - Show logged-in avatar URL, if available, for password-based login page.
+
+3.24.0
 -----------------------------
+  * Changes:
+    - Removed use of non-unique id for support checkboxes
+
+  * Upgrade Steps
+    - If you're overloading the style of the support label in custom.css you
+      may need to move a few things around. Instead of styling `.user-support label`,
+      style `.support-label-content`.
 
+2.1
+-----------------------------
   * New Features:
     - Translatable pages
 
@@ -80,68 +151,6 @@ Development (master)
 
     See the [configuration documentation](https://github.com/openplans/shareabouts/blob/714c41f3f00aeebaa0b25bf9297f4d0e67f92826/doc/CONFIG.md#pages-and-links) for more information.
 
-3.26.1
------------------------------
-  * Changes:
-    - Style moderation button similarly to other buttons
-
-3.26.0
------------------------------
-  * Changes:
-    - Allow overriding config parameters with environment variables
-
-      The majority of the configuration values in *config.yml* can be overridden
-      with environment variables. You can determine what the environment
-      variable to override a setting should be called by joining the setting's
-      path with double underscores, converting to uppercase, and prepending with
-      `SHAREABOUTS__`. For example, say you have the configuration options:
-
-      ```yml
-      place:
-        adding_supported:
-          from: 2017-03-07 09:00 -0500
-          until: 2017-04-04 09:00 -0400
-      ```
-
-      You could override these settings with the two env variables:
-
-      ```
-      SHAREABOUTS__PLACE__ADDING_SUPPORTED__FROM = 2017-03-07 09:00 -0500
-      SHAREABOUTS__PLACE__ADDING_SUPPORTED__UNTIL = 2017-04-04 09:00 -0400
-      ```
-
-    - Allow hiding/showing places and comments with appropriate permissions.
-
-      The following handlebars helpers can be used to check the current user's
-      permissions:
-
-      - `{{# can_add_places }}` -- Checks whether adding is supported or the
-        current user is in a `place.editors` group.
-      - `{{# can_moderate_places }}` -- Checks whether the current user is in a
-        `place.moderators` group. Moderators can show or hide places.
-      - `{{# can_edit_places }}` -- Checks whether the current user is in a
-        `place.editors` group. Editors can change the content of places, and
-        add places outside of the adding supported time.
-
-      When `can_add_places` is true, the add button show up on the interface.
-      When `can_edit_places` or `can_moderate_places` is true, a control bar with
-      show/hide and delete buttons is available on each place detail page.
-
-3.25.0
------------------------------
-  * Changes:
-    - Show logged-in avatar URL, if available, for password-based login page.
-
-3.24.0
------------------------------
-  * Changes:
-    - Removed use of non-unique id for support checkboxes
-
-  * Upgrade Steps
-    - If you're overloading the style of the support label in custom.css you
-      may need to move a few things around. Instead of styling `.user-support label`,
-      style `.support-label-content`.
-
 2.0.1
 -----------------------------
   * New Features:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.25.0
+4.0.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,117 +1,124 @@
-# The server
-dj-static==0.0.6
+-r app-requirements.txt
 
-# Templates
-django-jstemplate>=1.3.6
-django_compressor==1.6
+# Until the shareabouts-api package is updated to work with the latest version of
+# Django, the Shareabouts client and API server will not be able to run on the
+# same server. When the shareabouts-api package is updated, we can uncomment the
+# requirements below.
 
-# Web interface helpers
-django-proxy>=1.2.2
-httpagentparser
+# # The server
+# dj-static==0.0.6
 
-# Config
-pyyaml
-django-extensions==2.1.0
+# # Templates
+# django-jstemplate>=1.3.6
+# django_compressor==1.6
 
-# Testing
-jasmine
+# # Web interface helpers
+# django-proxy>=1.2.2
+# httpagentparser
 
+# # Config
+# pyyaml
+# django-extensions==2.1.0
 
-#=============================================================#
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
-#               Shareabouts API Dependencies                  #
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
-#=============================================================#
+# # Testing
+# jasmine
 
 
-git+https://github.com/openplans/shareabouts-api.git@api-app#shareabouts-api
+# #=============================================================#
+# # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
+# #               Shareabouts API Dependencies                  #
+# # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
+# #=============================================================#
 
 
-# ==============================
-# Web server
-# ==============================
+# git+https://github.com/openplans/shareabouts-api.git@api-app#shareabouts-api
 
-Django==1.8.18
-gunicorn==19.7.1
-newrelic==2.16.0.12
 
+# # ==============================
+# # Web server
+# # ==============================
 
+# Django==1.8.18
+# gunicorn==19.7.1
+# newrelic==2.16.0.12
 
-# ==============================
-# Background processing
-# ==============================
 
-celery==3.1.17
-django-celery==3.1.16
 
+# # ==============================
+# # Background processing
+# # ==============================
 
+# celery==3.1.17
+# django-celery==3.1.16
 
-# ==============================
-# Database and Persistence
-# ==============================
 
-# DB Settings and Management
-psycopg2==2.7.3.2
-psycogreen==1.0
-south==1.0.1
-dj-database-url==0.2.2
-django-object-actions==0.4.0
 
-# Caching
-django-redis==3.5.1
+# # ==============================
+# # Database and Persistence
+# # ==============================
 
-# File Storage
-boto==2.27.0
-django-storages==1.1.8
+# # DB Settings and Management
+# psycopg2==2.7.3.2
+# psycogreen==1.0
+# south==1.0.1
+# dj-database-url==0.2.2
+# django-object-actions==0.4.0
 
+# # Caching
+# django-redis==3.5.1
 
+# # File Storage
+# boto==2.27.0
+# django-storages==1.1.8
 
-# ==============================
-# User Accounts and Social Media
-# ==============================
 
-python-social-auth==0.1.23
-# Use fork of oauth2-provider, for Django 1.7 compatibility
-# django-oauth2-provider==0.2.6.1
-git+https://github.com/glassresistor/django-oauth2-provider.git@4269205#egg=django-oauth2-provider
-django-cors-headers==0.12
 
+# # ==============================
+# # User Accounts and Social Media
+# # ==============================
 
+# python-social-auth==0.1.23
+# # Use fork of oauth2-provider, for Django 1.7 compatibility
+# # django-oauth2-provider==0.2.6.1
+# git+https://github.com/glassresistor/django-oauth2-provider.git@4269205#egg=django-oauth2-provider
+# django-cors-headers==0.12
 
-# ==============================
-# REST API
-# ==============================
 
-djangorestframework==2.3.12
-djangorestframework-csv==1.3.0
-git+https://github.com/mjumbewu/django-rest-framework-bulk.git@492d762#egg=djangorestframework-bulk==0.2.1-m1
-six>=1.4.1
-markdown  # For browsable API docs
-python-dateutil==2.2
-ujson==1.33
 
-# The Django admin interface
-django-ace==1.0.1
+# # ==============================
+# # REST API
+# # ==============================
 
-# The manager interface
-requests>=1.2.0
+# djangorestframework==2.3.12
+# djangorestframework-csv==1.3.0
+# git+https://github.com/mjumbewu/django-rest-framework-bulk.git@492d762#egg=djangorestframework-bulk==0.2.1-m1
+# six>=1.4.1
+# markdown  # For browsable API docs
+# python-dateutil==2.2
+# ujson==1.33
 
+# # The Django admin interface
+# django-ace==1.0.1
 
+# # The manager interface
+# requests>=1.2.0
 
-# ==============================
-# Testing, validating, and debugging
-# ==============================
 
-nose
-django-nose
-mock
-mock_django
-responses==0.2.2
-django-debug-toolbar==1.2.1
-raven==5.19.0  # For Sentry error logging
 
+# # ==============================
+# # Testing, validating, and debugging
+# # ==============================
 
-# - - - - - - - - - - - - - - - -
+# nose
+# django-nose
+# mock
+# mock_django
+# responses==0.2.2
+# django-debug-toolbar==1.2.1
+# raven==5.19.0  # For Sentry error logging
 
-# For DRF 0.4 (deprecated)
-URLObject>=0.6.0
+
+# # - - - - - - - - - - - - - - - -
+
+# # For DRF 0.4 (deprecated)
+# URLObject>=0.6.0