Release 1.2.0 (#183)

* update rfp image * updating validation workflow for large # errors and other small tweaks * updating use case process diagram and adding link to it from use case page * Update onboarding doc to v1.2 Add publication workflow diagram * fix test? * does this fix it? * adding example files * set 2.4.0 as default version * adding v2.4.0 schema * update references to website repo and ipynb * Update README.md Co-authored-by: Katherine Fleming <[email protected]> * share a link to a particular spot in the schema tree * adding links to auxiliary files on current schema page * fix striping on enums table * precommit * fix link to BuildingSync schema * fix GitHub schema link * fix paths * Update BEDES Mapping * Update bsyncviewer/management/commands/bedes.py Co-authored-by: Jie Xiong <[email protected]> * fix link to bsync versioning * example zip must be names example_files.zip * Update bsyncviewer/management/commands/bedes.py Co-authored-by: Nicholas Long <[email protected]> * remove old prereleased from the website. use the final releases or go to github to see the old prereleases * remove old prereleased from the website. use the final releases or go to github to see the old prereleases * remove pr2 * Add v2.5 file * remove constraint on bedes contraint * fix versions of bsync files in 2.4.0 validator * update version in headers of xml files, but point to bsync2.3.1 with enum 2.3.0 * flake8 * updating bedes mappings and css tweak for schema list page * update enums again * adding google groups * Fix validator file options * Fix mistakes in enum mapping * edge case fix for type references enums and unions enums * autopep8 * Bump django from 2.2.24 to 2.2.27 Bumps [django](https://github.com/django/django) from 2.2.24 to 2.2.27. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@2.2.24...2.2.27) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * workaround for example files dropdown by version * flake8 * increase bedes field sizes migration and update mapping * python notebook is now a markdown file! * exclude tox in coverage * Bump django from 2.2.27 to 2.2.28 Bumps [django](https://github.com/django/django) from 2.2.27 to 2.2.28. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@2.2.27...2.2.28) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * move reference to correct year * precommit * fix flake8 issue * Update contact information * Fix BuildingSync Gem link * Add image credentials * Don't link to github releases * Fix "why standardize my data" link * Fix audit template name * Fix Case study name * Update contact info * Update seed links * Download example file, don't link to it * Order Validation results * Update colaberators * Address comments * Major Improvements - Fixed schema version sorting - Fixed broken and redirect links - Added rel=noopener to external links - Optimized all images, and converted large images to webp with jpg fallbacks - Fixed mixed tabs/spaces - Added favicon - Fixed javascript errors - Converted hardcoded urls to Django template tags - Fixed Windows postgres support * Updated publications * Update lxml * Update Python CI * upgrade to python 3.7.10 by bumping alpine to 3.10 * Updated docs, links, and fixed typos * Added onboarding md/html/pdf and generation task Updated collaborators/adopters * Fix onboarding header height * Updated technical resources and onboarding links * add a couple items to changelog * Add BAE to tools * Update bsyncviewer/templates/tools.html Co-authored-by: Lauren Adams <[email protected]> * Add warnings * Clean * Clean * Fix Typo * update schema and example * Update examples etc. * add bedes mappings for 2.5.0 * update instruction and onboarding * update onboarding docs * save config * major code cleanup * add json formatting * add precommit and break out the requirements-test dependencies * update python versiobn * fix python tox * fix python tox * move dependencies * more updates to config * bump versions * versions * changelog --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: kflemin <[email protected]> Co-authored-by: Xiong <[email protected]> Co-authored-by: haneslinger <[email protected]> Co-authored-by: Jie Xiong <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kflemin <[email protected]> Co-authored-by: Alex Swindler <[email protected]> Co-authored-by: Lauren Adams <[email protected]>
BuildingSync · Oct 4, 2023 · a5832e8 · a5832e8
1 parent e0d9d0e
commit a5832e8
Show file tree

Hide file tree

Showing 224 changed files with 123,731 additions and 19,730 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,3 @@
+[run]
+omit =
+    *.tox*
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{css,html,js,json}]
+indent_size = 2
+
+[*.py]
+indent_size = 4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,13 +3,16 @@ name: CI
 on:
   pull_request:
   push:
+    branches:
+      - "develop"
+      - "main"
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tox_env: [python, flake8]
+        tox_env: [python] #, precommit]
     services:
       postgres:
         image: postgres:9.6
@@ -25,28 +28,23 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
-      -
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
-          python-version: '3.6'
-      -
-        name: Display system info
+          python-version: "3.7"
+      - name: Display system info
         run: python -c "import sys; print(sys.version)"
-      -
-        name: Setup Python
+      - name: Setup Python
         run: |
           apt-get update && apt-get install python-enchant -y
           pip install tox
           pip install --upgrade pip
           pip install tox coveralls
-      -
-        name: Run tox
+      - name: Run tox
         env:
           DJANGO_SETTINGS_MODULE: bsyncviewer.settings.gh_actions
         run: tox -e ${{ matrix.tox_env }}
-      -
-        name: Coveralls
+      - name: Coveralls
         if: ${{ success() && matrix.tox_env == 'python' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+.vscode
 .idea
 .DS_Store
 db.sqlite3
@@ -93,7 +94,3 @@ schema_file_*
 use_case_file_*
 mapping_template*
 template_*
-bedes-mappings-*.csv
-bsyncviewer/lib/bedes/*/schema*/bedes-mappings-enumerations.csv
-bsyncviewer/lib/bedes/*/schema*/bedes-mappings-terms.csv
-bsyncviewer/lib/bedes/*/schema*/bsync_unique_words.csv
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,24 +1,63 @@
-repos:
-- repo: git://github.com/pre-commit/pre-commit-hooks
-  rev: v2.2.3
-  hooks:
-  - id: trailing-whitespace
-  - id: check-added-large-files
-    args: ['--maxkb=3000']
-  - id: check-ast
-  - id: check-json
-  - id: check-merge-conflict
-  - id: check-xml
-  - id: check-yaml
-  - id: debug-statements
-  - id: end-of-file-fixer
-#  - id: requirements-txt-fixer
-  - id: mixed-line-ending
-  - id: flake8
-    args: ['--max-line-length=140']  # default of Black
+exclude: |
+  (?x)(
+    ^bsyncviewer/static/css/owl.carousel.min.css|
+    ^bsyncviewer/static/css/font-awesome.min.css|
+    ^bsyncviewer/static/css/owl.theme.default.min.css|
+    ^bsyncviewer/static/css/magnific-popup.css|
+    ^bsyncviewer/static/css/responsive.css|
+    ^bsyncviewer/static/css/et-line.css|
+    ^bsyncviewer/static/img/better-logo.svg
+  )
 
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v4.3.4
-  hooks:
-  - id: isort
-    args: ['-m 3']  # vertical hanging
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-added-large-files
+        args: ["--maxkb=2000"]
+      - id: check-ast
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-xml
+      - id: check-yaml
+        exclude: .*/templates
+      - id: debug-statements
+      - id: end-of-file-fixer
+        exclude: seed/static/seed/locales/
+      - id: mixed-line-ending
+        exclude: seed/static/seed/locales/
+      - id: pretty-format-json
+        args: ["--autofix", "--no-sort-keys"]
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v5.10.1
+    hooks:
+      - id: isort
+        args:
+          [
+            -m=VERTICAL_HANGING_INDENT,
+            --skip=seed/models/__init__.py,
+            --filter-files,
+          ]
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.2.1
+    hooks:
+      - id: autoflake
+        args:
+          [
+            "--in-place",
+            "--recursive",
+            "--remove-all-unused-imports",
+            "--remove-unused-variable",
+          ]
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        args: ["--ignore=F401,E402,E501,E731,W503,W504"]
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.0.3
+    hooks:
+      - id: prettier
+        # for now ignoring html, javascript
+        types_or: [yaml, markdown, css, scss]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,55 @@
 # BuildingSync Use Case Selection Tool
 
+## Version 1.2.0
+
+## What's Changed
+
+- updating validation workflow for large # errors and other small tweaks by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/130
+- updating use case process diagram and adding link to it from use case… by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/131
+- Update onboarding doc to v1.2 by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/133
+- adding example files by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/135
+- set 2.4.0 as default version by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/137
+- update references to website repo and ipynb by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/138
+- share a link to a particular spot in the schema tree by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/141
+- Fix bsync links by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/143
+- Paths to Example Files and Jupyter Notebook by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/144
+- Update BEDES Mapping by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/146
+- Add BEDES v2.5 mapping file by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/150
+- example zip must be names example_files.zip by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/148
+- fix link to bsync versioning by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/147
+- Fix versions of examples by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/151
+- Remove old prereleases by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/149
+- remove constraint on bedes contraint by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/152
+- BEDES fix by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/157
+- Fix validator file options by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/158
+- Fix mistakes in enum mapping by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/159
+- edge case fix for type references enums and unions enums by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/162
+- workaround for example files dropdown by version by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/164
+- Bump django from 2.2.24 to 2.2.27 by @dependabot in https://github.com/BuildingSync/BuildingSync-website/pull/163
+- link to python notebook as a markdown file by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/167
+- increase bedes field sizes migration and update mapping by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/166
+- Bump django from 2.2.27 to 2.2.28 by @dependabot in https://github.com/BuildingSync/BuildingSync-website/pull/168
+- move reference to correct year by @kflemin in https://github.com/BuildingSync/BuildingSync-website/pull/169
+- Update website by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/171
+- Major Improvements by @axelstudios in https://github.com/BuildingSync/BuildingSync-website/pull/172
+- Updated Publications and lxml by @axelstudios in https://github.com/BuildingSync/BuildingSync-website/pull/173
+- Upgrade to Python 3.7.10 by bumping alpine to 3.10 by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/175
+- Update Python CI by @axelstudios in https://github.com/BuildingSync/BuildingSync-website/pull/174
+- Updated Onboarding & Collaborators by @axelstudios in https://github.com/BuildingSync/BuildingSync-website/pull/176
+- Fix onboarding header height by @axelstudios in https://github.com/BuildingSync/BuildingSync-website/pull/177
+- Add BAE to tools by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/178
+- Add warnings by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/180
+- Release BuildingSync 2.5 by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/181
+- Update documentation for BuildingSync 2.5 by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/182
+- Update pre-commit and break out test dependencies by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/184
+
+## New Contributors
+
+- @haneslinger made their first contribution in https://github.com/BuildingSync/BuildingSync-website/pull/146
+- @axelstudios made their first contribution in https://github.com/BuildingSync/BuildingSync-website/pull/172
+
+**Full Changelog**: https://github.com/BuildingSync/BuildingSync-website/compare/v1.1.4...v1.2.0
+
 ## Version 1.1.4
 
 Date Range: 06/15/2021 - 07/31/2021
@@ -40,30 +90,30 @@ Updates:
 
 General updates:
 
-* Parser changes to handle restriction by pattern
-* Adding L000 OpenStudio Simulation use case and example files
-* Dockerize TestSuite repository
+- Parser changes to handle restriction by pattern
+- Adding L000 OpenStudio Simulation use case and example files
+- Dockerize TestSuite repository
 
 Date Range: 12/21/20 - 03/26/20
 
-
 ## Version 1.1.0
 
 Date Range: 11/19/19 - 12/20/19
 
 Closed Issues and Features:
-- Feature [#38]( https://github.com/BuildingSync/selection-tool/issues/38 ), New Test Suite Page (<url>/examples)
-- Feature [#22]( https://github.com/BuildingSync/selection-tool/issues/22 ), Add selection-tool version to the webpage
-- Fixed [#23]( https://github.com/BuildingSync/selection-tool/issues/23 ), Support unusual characters in use case names
-- Fixed [#25]( https://github.com/BuildingSync/selection-tool/issues/25 ), test out script to generate permission schematron document
-- Fixed [#31]( https://github.com/BuildingSync/selection-tool/issues/31 ), Remove Bedes CSVs from repo
-- Fixed [#32]( https://github.com/BuildingSync/selection-tool/issues/32 ), Store XML example files for each schema version
-- Fixed [#33]( https://github.com/BuildingSync/selection-tool/issues/33 ), make schematron use case files downloadable on public use cases
-- Fixed [#34]( https://github.com/BuildingSync/selection-tool/issues/34 ), Document instructions for adding a new schema
-- Fixed [#35]( https://github.com/BuildingSync/selection-tool/issues/35 ), Rename Data Dictionary to Schema Viewer
-- Fixed [#36]( https://github.com/BuildingSync/selection-tool/issues/36 ), Rework home page
-- Fixed [#37]( https://github.com/BuildingSync/selection-tool/issues/37 ), change site name
-- Fixed [#39]( https://github.com/BuildingSync/selection-tool/issues/39 ), BEDES Email Address has raw python object
+
+- Feature [#38](https://github.com/BuildingSync/selection-tool/issues/38), New Test Suite Page (<url>/examples)
+- Feature [#22](https://github.com/BuildingSync/selection-tool/issues/22), Add selection-tool version to the webpage
+- Fixed [#23](https://github.com/BuildingSync/selection-tool/issues/23), Support unusual characters in use case names
+- Fixed [#25](https://github.com/BuildingSync/selection-tool/issues/25), test out script to generate permission schematron document
+- Fixed [#31](https://github.com/BuildingSync/selection-tool/issues/31), Remove Bedes CSVs from repo
+- Fixed [#32](https://github.com/BuildingSync/selection-tool/issues/32), Store XML example files for each schema version
+- Fixed [#33](https://github.com/BuildingSync/selection-tool/issues/33), make schematron use case files downloadable on public use cases
+- Fixed [#34](https://github.com/BuildingSync/selection-tool/issues/34), Document instructions for adding a new schema
+- Fixed [#35](https://github.com/BuildingSync/selection-tool/issues/35), Rename Data Dictionary to Schema Viewer
+- Fixed [#36](https://github.com/BuildingSync/selection-tool/issues/36), Rework home page
+- Fixed [#37](https://github.com/BuildingSync/selection-tool/issues/37), change site name
+- Fixed [#39](https://github.com/BuildingSync/selection-tool/issues/39), BEDES Email Address has raw python object
 
 ## Version 1.0
 
@@ -73,5 +123,6 @@ Date Range: Initial Commit - 11/15/19
 - See README.md for more details
 
 Closed Issues and Features:
-- Fixed [#11]( https://github.com/BuildingSync/selection-tool/issues/11 ), Support Schematron
-- Fixed [#13]( https://github.com/BuildingSync/selection-tool/issues/13 ), Add BuildingSync Version 2.0-Prerelease
+
+- Fixed [#11](https://github.com/BuildingSync/selection-tool/issues/11), Support Schematron
+- Fixed [#13](https://github.com/BuildingSync/selection-tool/issues/13), Add BuildingSync Version 2.0-Prerelease
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # AUTHOR:           Nicholas Long <[email protected]>
 # DESCRIPTION:      Dockerfile for running BuildingSync Data Selection Tool
 # TO_BUILD_AND_RUN: docker-compose build && docker-compose up
-FROM alpine:3.8
+FROM alpine:3.10
 
 RUN apk add --no-cache python3 \
         python3-dev \