Skip to content

Commit b4cf622

Browse files
authored
Update app version and changelog (#203)
* changelog and app version * add in other PRs * remove old change log file, use github autogenerate now * cleanup readme
1 parent 982cc29 commit b4cf622

File tree

5 files changed

+56
-200
lines changed

5 files changed

+56
-200
lines changed

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BuildingSync Use Case Selection Tool
22

3-
## Version 1.4.0
3+
## Version 1.3.0
44

55
Date Range: 10/05/23 - 09/30/25
66

@@ -10,6 +10,7 @@ Date Range: 10/05/23 - 09/30/25
1010
- Replaces the old `selection-tool` names with `buildingsync-website`.
1111
- Updates to support Python 3.9 (older versions have been deprecated)
1212
- Support latest version of jellyfish
13+
- Update base docker image
1314

1415
New Issues:
1516

@@ -20,6 +21,21 @@ Closed Issues and Features:
2021
- Fixed [#189](https://github.com/BuildingSync/BuildingSync-website/issues/189), Download Examples button broken
2122
- Fixed [#192](https://github.com/BuildingSync/BuildingSync-website/issues/192), BEDES v2.5 mapping
2223

24+
## What's Changed
25+
26+
- Update changelog by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/185
27+
- Release 1.2.0 (#183) by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/186
28+
- Remove remnants of selection tool naming by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/187
29+
- Release BuildingSync 2.6.0 by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/190
30+
- BEDES v2.5 - BuildingSync 2.6 mapping by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/193
31+
- Add descriptions by @haneslinger in https://github.com/BuildingSync/BuildingSync-website/pull/194
32+
- Update versions of dependencies by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/196
33+
- Add integration test by @nllong in https://github.com/BuildingSync/BuildingSync-website/pull/199
34+
- Release BuildingSync 2.7.0 by @JieXiong9119 in https://github.com/BuildingSync/BuildingSync-website/pull/195
35+
- ci: bump the actions-deps group with 2 updates by @dependabot[bot] in https://github.com/BuildingSync/BuildingSync-website/pull/197
36+
37+
**Full Changelog**: https://github.com/BuildingSync/BuildingSync-website/compare/v1.2.0...v1.3.0
38+
2339
## Version 1.2.0
2440

2541
## What's Changed

README.md

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ This is the repository for the BuildingSync Validator web application.
5353
python manage.py reset_schema --schema_version=2.6.0
5454
```
5555

56-
**NOTE**: You will need to be _off_ the NREL VPN to import a schema, otherwise you'll get an error related to http://www.gbxml.org/schema}Area' as the gbXML schema cannot be imported when on the NREL VPN.
56+
**NOTE**: You will need to be _off_ the NREL VPN to import a schema, otherwise you'll get an error related to `http://www.gbxml.org/schema}Area'` as the gbXML schema cannot be imported when on the NREL VPN.
5757
5858
### Pre-commit
5959
60-
This project used `pre-commit <https://pre-commit.com/>`\_ to ensure code consistency. To enable pre-commit, run the following from the command line.
60+
This project uses [pre-commit](https://pre-commit.com/) to ensure code consistency. To enable pre-commit, run the following from the command line:
6161
6262
```bash
6363
pip install pre-commit
@@ -72,17 +72,18 @@ pre-commit run --all-files
7272

7373
### Testing
7474

75-
- To run test:
75+
To run tests:
7676

77-
```bash
78-
./manage.py test
79-
```
77+
```bash
78+
./manage.py test
79+
```
8080

81-
- To calculate coverage:
82-
```bash
83-
coverage run --source='.' manage.py test
84-
coverage report
85-
```
81+
To calculate coverage:
82+
83+
```bash
84+
coverage run --source='.' manage.py test
85+
coverage report
86+
```
8687

8788
## Usage
8889

@@ -113,9 +114,10 @@ The validator page allows users to validate XMLs against the BuildingSync schema
113114

114115
There is also a validator endpoint to validate XML files against the BuildingSync schema and its public use cases.
115116

116-
#### SINGLE XML
117+
#### Single XML
118+
119+
**Request**: POST to `https://buildingsync.net/api/validate`
117120

118-
Request: POST to https://buildingsync.net/api/validate
119121
Use form-data to specify the following parameters for schema version and XML file: `schema_version` and `file`.
120122

121123
Example Response:
@@ -155,9 +157,10 @@ Example Response:
155157
}
156158
```
157159

158-
#### ZIP with multiple XMLs
160+
#### ZIP with Multiple XMLs
161+
162+
**Request**: POST to `https://buildingsync.net/api/validate`
159163

160-
Request: POST to https://buildingsync.net/api/validate
161164
Use form-data to specify the following parameters for schema version and XML file: `schema_version` and `file`.
162165

163166
Example Response:
@@ -238,33 +241,35 @@ To parse and map a new BEDES version:
238241

239242
1. Download the `bedes_online_dictionary_uuid-lo.xml` and the `bedes_online_dictionary_uuid-terms.xml` files from the BEDES website.
240243

241-
1. Place these new BEDES XMLs in the lib/bedes/vX.X directory. vX.X refers to the BEDES version here.
244+
2. Place these new BEDES XMLs in the `lib/bedes/vX.X` directory. `vX.X` refers to the BEDES version here.
242245

243-
1. Parse the BEDES XMLs into a JSON file and map the BEDES terms to the BuildingSync attributes:
246+
3. Parse the BEDES XMLs into a JSON file and map the BEDES terms to the BuildingSync attributes:
244247

245248
```bash
246249
docker exec -it buildingsync-website-web-1 bash
247250
python manage.py bedes --schema_version=X.X.X --bedes_version=X.X
248251
```
249252

250-
Note that the bedes_version contains a `v`, ex: v2.2.
251-
This will create a bedes_vX.X.json`file in the lib/bedes/vX.X directory. It will also create 2 CSV files:`bedes-mappings-enumerations.csv`and`bedes-mappings-terms.csv` in the lib/bedes/vX.X/schemaX.X directory.
253+
Note that the `bedes_version` contains a `v`, ex: `v2.2`.
254+
This will create a `bedes_vX.X.json` file in the `lib/bedes/vX.X` directory. It will also create 2 CSV files: `bedes-mappings-enumerations.csv` and `bedes-mappings-terms.csv` in the `lib/bedes/vX.X/schemaX.X` directory.
252255

253-
_Note_ &mdash; The BEDES terms must be mapped for each version of the BuildingSync schema by calling the python manage.py bedes` command above.
256+
**Note**: The BEDES terms must be mapped for each version of the BuildingSync schema by calling the `python manage.py bedes` command above.
254257

255-
1. Copy the generated bedes files to the git repo on the production server. The command will be something like:
258+
4. Copy the generated bedes files to the git repo on the production server. The command will be something like:
256259

257-
```
260+
```bash
258261
docker cp buildingsync-website-web-1:/srv/buildingsync-website/bsyncviewer/lib/bedes/v2.5/schema2.5.0 .
259262
```
260263

261-
1. Review these mapping files and make changes as needed. Commit and push the files to the BuildingSync-website repository (ideally a branch).
264+
5. Review these mapping files and make changes as needed. Commit and push the files to the BuildingSync-website repository (ideally a branch).
265+
266+
6. Once satisfied with the mappings, run the same command with the `--save_to_db` flag:
262267

263-
1. Once satisfied with the mappings, run the same command with the --save_to_db flag:
264268
```bash
265269
python manage.py bedes --schema_version=X.X.X --bedes_version=X.X --save_to_db
266270
```
267-
Note that you must run this command without the --save_to_db flag first, in order to create the CSV files.
271+
272+
Note that you must run this command without the `--save_to_db` flag first, in order to create the CSV files.
268273

269274
### Admin Interface
270275

@@ -284,7 +289,7 @@ Follow these steps to add a new schema version to the selection tool:
284289
7. Create PR and merge with the changes.
285290
8. Reparse BEDES terms to map them to the new schema following the steps in the BEDES section above.
286291
9. Deploy website on production.
287-
10. If needed, update CHANGELOG and create PR from develop to main for new release of this site (see [release_instructions.md](docs/release_instructions.md)).
292+
10. If needed, update CHANGELOG and create PR from develop to main for new release of this site (see [Release Instructions](docs/release_instructions.md)).
288293

289294
### Adding Examples from the TestSuite repo
290295

app_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.3.0

docs/release_instructions.md

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,10 @@
33
Follow the list below for a new release:
44

55
1. Copy the corresponding schema file into `bsyncviewer/lib/buildingsync_schemas/` and rename it
6-
2. Update version file (/app_version.txt). Update version to next appropriate version. Always use MAJOR.MINOR.RELEASE.
7-
3. Run the `docs/scripts/change_log.py` script and add the changes to the CHANGELOG.md file for the range of time between last release and this release. Only add the _Closed Issues_. Also make sure that all the pull requests have a related Issue in order to be included in the change log.
8-
9-
```
10-
python docs/scripts/change_log.py –k GITHUB_API_TOKEN –s 2018-02-26 –e 2018-05-30
11-
```
12-
13-
4. Paste the results (remove unneeded Accepted Pull Requests) into the CHANGELOG.md. Make sure to cleanup the formatting if needed.
14-
5. Once develop passes, create a new PR from develop to main.
15-
6. Draft new Release from Github (https://github.com/BuildingSync/BuildingSync-website/releases).
16-
17-
```bash
18-
git checkout main && git pull
19-
git tag -a v<version> -m "<message>" [SHA]
20-
git push --tags origin
21-
```
22-
23-
Include list of changes since previous release in `<message>` (i.e., the content in the CHANGELOG.md). [SHA] is used for specific commit (when the tag does not correspond to the latest commit).
6+
2. Create a branch for the release prep (e.g., `release/v1.3.0-prep`)
7+
3. Update version file (/app_version.txt). Update version to next appropriate version. Always use MAJOR.MINOR.RELEASE.
8+
4. Run `pre-commit run --all-files` locally, and commit changes.
9+
5. Within GitHub, draft a new release and autogenerate the change log (https://github.com/BuildingSync/BuildingSync-website/releases). Copy the changes into the CHANGELOG.md file. Clean up any items that are not relevant to the release.
10+
6. Create a PR from the release prep branch to develop. Request reviews and merge once approved.
11+
7. From command line, merge latest develop into latest main `git checkout main; git pull; git merge --ff-only origin develop`. This will point the HEAD of main to latest develop. Then push the main branch to GitHub with `git push`, which may require a developer with elevated privileges to push to main.
12+
8. Back on GitHub create a new tag in GitHub against main and copy the change log notes into the tag description.

docs/scripts/change_log.py

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)