Merge pull request #2162 from SEED-platform/prep-2.7.0

Prepare release 2.7.0

.gitignore

@@ -29,6 +29,7 @@ web_root/uploads/*
 web_root/images/sites/*
 config/settings_local.py
 config/local_untracked.py
+config/settings/local_untracked.py.dist.*
 config/settings/local_untracked.py
 node_modules/*
 web_root/CACHE

CHANGELOG.md

@@ -1,12 +1,12 @@
-# SEED Version 2.7.0-Beta
+# SEED Version 2.7.0
 
-SEED Version 2.7.0-Beta includes several significant updates that need to be thoroughly tested on production data
+SEED Version 2.7.0 includes several significant updates that need to be thoroughly tested on production data
 before being deployed. The most notable changes:
 
 - User can define which fields to match/merge/pair/link
-- Properties and Tax Lots are not linked across multiple years or compliance cycles
+- Properties and Tax Lots are now linked across multiple years or compliance cycles
 - Users can define mapping profiles to save/recall mappings easier
-- 55 closed issues/new features
+- 57 closed issues/new features
 
 Date Range: 09/30/19 - 12/20/19
 
@@ -50,8 +50,8 @@ Closed Issues and Features:
 - Fixed [#1348]( https://github.com/SEED-platform/seed/issues/1348 ), DQ Checking -- for Valid data, not errors in data
 - Fixed [#786]( https://github.com/SEED-platform/seed/issues/786 ), Save Changes button sequence in Data Cleansing Admin
 - Fixed [#1998]( https://github.com/SEED-platform/seed/issues/1998 ), First edit including lat long change doesn't trigger manual geocoding logic
-- Improved [#1592]( https://github.com/SEED-platform/seed/issues/1592 ), Prevent adding an org with existing name 
-- Fixed [#1592]( https://github.com/SEED-platform/seed/issues/1992 ), Data Mapping for imported files does not reflect the actual mapping for that data file 
+- Improved [#1592]( https://github.com/SEED-platform/seed/issues/1592 ), Prevent adding an org with existing name
+- Fixed [#1592]( https://github.com/SEED-platform/seed/issues/1992 ), Data Mapping for imported files does not reflect the actual mapping for that data file
 - Feature [#1591]( https://github.com/SEED-platform/seed/issues/1591 ), Detail Screen: Highlight the changes in the columns
 - Feature [#1232]( https://github.com/SEED-platform/seed/issues/1232 ), Need easy way to view data year over year
 - Fixed [#1946]( https://github.com/SEED-platform/seed/issues/1946 ), Meter data visible on some cycles but not all
@@ -61,6 +61,11 @@ Closed Issues and Features:
 - Fixed [#1913]( https://github.com/SEED-platform/seed/issues/1913 ), Add Notes info to export
 - Fixed [#1713]( https://github.com/SEED-platform/seed/issues/1713 ), Return progress status immediately when uploading large files
 
+The item(s) below are patched applied to 2.7.0-Beta
+- Feature [#2134]( https://github.com/SEED-platform/seed/issues/2134 ), Add new column setting to allow blank/'Not Available' values to overwrite other values
+- Update ESPM connection to support latest update.
+- Fixed [#2119]( https://github.com/SEED-platform/seed/issues/2119 ), Re-enable created and updated fields for master records on the front end
+
 # SEED Version 2.6.1-Patch1
 
 - Fixed [#2076]( https://github.com/SEED-platform/seed/issues/2076 ), ESPM import no longer works due to ESPM website updates

docs/source/migrations.rst

@@ -47,13 +47,18 @@ local_untracked.py file
         ),
     )
 
+Version 2.7.0
+-------------
+
+- This migration will run a match/merge/pair/link method upon migration. Make sure to run the migration manually and not inside of the docker container using the ./deploy.sh script.
+- Make sure to backup the database before peforming the migration.
+- Run `./manage.py migrate`.
 
 Version 2.6.1
 -------------
 
 - The migrations should work without additional support. Simply run `./manage.py migrate`. There are no manual migrations needed for the 2.6.1 release.
 
-
 Version 2.6.0
 -------------
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "seed",
-  "version": "2.7.0-Beta",
+  "version": "2.7.0",
   "description": "Standard Energy Efficiency Data (SEED) Platform™",
   "license": "SEE LICENSE IN LICENSE",
   "directories": {