Merge pull request #168 from thegridelectric/dev

version 0.5.3

CODE_OF_CONDUCT.md

@@ -1,120 +1,73 @@
-# Contributor Covenant Code of Conduct
+# GridWorks Energy Consulting Code of Conduct
 
-## Our Pledge
+## Basic Truth
 
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
+All humans are worthy.
 
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
+## Scope
 
-- The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+This Code of Conduct applies to moderation of comments, issues and commits within
+this repository to support its alignment to the above basic truth.
 
 ## Enforcement Responsibilities
 
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
+[GridWorks Energy Consulting LLC](https://gridworks-consulting.com/) ([gridworks@gridworks-consulting.com](mailto:gridworks@gridworks-consulting.com))
+owns and administers this repository, and is ultimately responsible for enforcement of standards of
+behavior. They are responsible for merges to dev and main branches, and maintain the right and
+responsibility to remove, edit, or reject comments, commits, code, docuentation edits, issues, and other contributions
+that are not aligned to this Code of Conduct, and will communicate reasons for moderation
 decisions when appropriate.
 
-## Scope
+If you read something in this repo that you want GridWorks to consider moderating, please
+send an email to them at [gridworks@gridworks-consulting.com](mailto:gridworks@gridworks-consulting.com).
+All complaints will be reviewed and investigated, and GridWorks will respect
+the privacy and security of the reporter of any incident.
 
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
+## What not to add to this repo
 
-## Enforcement
+Ways to trigger GridWorks moderation enforcement:
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[jmillar@gridworks-consulting.com](mailto:jmillar@gridworks-consulting.com).
-All complaints will be reviewed and investigated promptly and fairly.
+- Publish others' private information, such as a physical or email address,
+  without their explicit permission
+- Use of sexualized language or imagery, or make sexual advances
+- Troll
 
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
+## Suggestions
 
-## Enforcement Guidelines
+- Empathize
+- Recognize you are worthy of contributing, and do so in the face of confusion and doubt; you can help clarify things for everyone
+- Be interested in differing opinions, viewpoints, and experiences
+- Give and accept constructive feedback
+- Accept responsibility for your mistakes and learn from them
+- Recognize everybody makes mistakes, and forgive
+- Focus on the highest good for all
 
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
+## Enforcement Escalation
 
 ### 1. Correction
 
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
+A private, written request from GridWorks to change or edit a comment, commit, or issue.
 
 ### 2. Warning
 
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
+With a warning, GridWorks may remove your comments, commits or issues. They may also
+freeze a conversation.
 
 ### 3. Temporary Ban
 
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
+A temporary ban from any sort of interaction or public
+communication within the repository for a specified period of time. No public or
 private interaction with the people involved, including unsolicited interaction
 with those enforcing the Code of Conduct, is allowed during this period.
 Violating these terms may lead to a permanent ban.
 
 ### 4. Permanent Ban
 
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+A permanent ban from any sort of interaction within the repository.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+This Code of Conduct is loosely adapted from the [Contributor Covenant][homepage],
 version 2.1, available at
 [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 

CodeGenerationTools/GridworksCore/Enum/EnumInit/DeriveEnumInit.xslt

@@ -26,7 +26,7 @@
                 <xsl:element name="FileContents">
 <xsl:text>""" GwSchema Enums used in gwproto """</xsl:text>
 <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
-<xsl:sort select="EnumName" data-type="text"/>
+<xsl:sort select="LocalEnumName" data-type="text"/>
 <xsl:variable name="enum-id" select="Enum"/>
 <xsl:for-each select="$airtable//GtEnums/GtEnum[GtEnumId=$enum-id]">
 <xsl:text>
@@ -44,7 +44,7 @@ from gwproto.enums.</xsl:text>
 
 __all__ = [</xsl:text>
 <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
-<xsl:sort select="EnumName" data-type="text"/>
+<xsl:sort select="LocalEnumName" data-type="text"/>
 <xsl:variable name="enum-id" select="Enum"/>
 <xsl:for-each select="$airtable//GtEnums/GtEnum[GtEnumId=$enum-id]">
 

docs/enums.rst

@@ -1,5 +1,5 @@
-GridWorks Enums
+Gwproto Enums
 ================
 
-.. automodule:: gridworks.enums
+.. automodule:: gwproto.enums
     :members:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gridworks-protocol"
-version = "0.5.2"
+version = "0.5.3"
 description = "Gridworks Protocol"
 authors = ["Jessica Millar <jmillar@gridworks-consulting.com>"]
 license = "MIT"
@@ -23,7 +23,7 @@ python = ">=3.10, <4.0"
 pydantic = "^1.10.2"
 pendulum = "^2.1.2"
 fastapi-utils = "^0.2.1"
-gridworks = "0.2.4"
+gridworks = "0.2.5"
 
 [tool.poetry.dev-dependencies]
 Pygments = ">=2.10.0"