Skip to content

Commit

Permalink
Merge pull request #3123 from SEED-platform/main
Browse files Browse the repository at this point in the history
Merge latest main into develop
  • Loading branch information
nllong committed Feb 10, 2022
2 parents 92d03f2 + 9de35f1 commit 4b5a878
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SEED Version 2.13.0 Prerelease 1
# SEED Version 2.13.0

Date Range: 11/20/21 - 12/27/21

Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seed",
"version": "2.13.0-pr1",
"version": "2.13.0",
"description": "Standard Energy Efficiency Data (SEED) Platform™",
"license": "SEE LICENSE IN LICENSE",
"directories": {
Expand Down
5 changes: 5 additions & 0 deletions seed/building_sync/mappings.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""

import copy
from datetime import datetime

Expand Down
5 changes: 5 additions & 0 deletions seed/building_sync/validation_client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""

import os
import zipfile

Expand Down
4 changes: 4 additions & 0 deletions seed/data_importer/meters_parser.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# !/usr/bin/env python
# encoding: utf-8
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""

from calendar import monthrange

Expand Down
5 changes: 5 additions & 0 deletions seed/models/auditlog.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""

from __future__ import unicode_literals

AUDIT_IMPORT = 0
Expand Down
4 changes: 4 additions & 0 deletions seed/serializers/pint.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""
"""
Collects the various utility functions for doing a last-moment collapse of the
Pint-aware values/columns to raw floats before sending them out over the API.
Generally this collapsing relies on having access to the organization, since
Expand Down
5 changes: 5 additions & 0 deletions seed/validators.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
:copyright (c) 2014 - 2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy) and contributors. All rights reserved. # NOQA
:author
"""

import re

from django.core.exceptions import ValidationError
Expand Down

0 comments on commit 4b5a878

Please sign in to comment.