Skip to content

Commit 94ad94b

Browse files
authored
Merge pull request #19 from BuildingSync/develop
prep for 0.3.0-alpha.0 release
2 parents c7a208c + 350ff69 commit 94ad94b

9 files changed

Lines changed: 520 additions & 272 deletions

File tree

.github/workflows/ci.yml

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,49 @@ jobs:
1212
python-version: [3.7, 3.8]
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v2
18-
with:
19-
python-version: ${{ matrix.python-version }}
20-
21-
- name: Display Python version
22-
run: python -c "import sys; print(sys.version)"
23-
24-
- name: Install poetry
25-
uses: abatilo/actions-poetry@v2.0.0
26-
27-
- name: Install poetry (and update) and pre-commit
28-
run: |
29-
poetry update
30-
poetry run pre-commit install
31-
32-
- name: Run pre-commit
33-
run: poetry run pre-commit run --all-files
34-
35-
- name: Run tests
36-
run: poetry run pytest
37-
38-
- name: Run Generator (BuildingSync 2.4)
39-
run: |
40-
curl -L -o bsyncpy/BuildingSync-2.4.xsd https://github.com/BuildingSync/schema/releases/download/v2.4.0/BuildingSync.xsd
41-
cd bsyncpy
42-
poetry run python bsyncpy_generator.py BuildingSync-2.4.xsd
15+
- uses: actions/checkout@v2
16+
- name: Set up Python ${{ matrix.python-version }}
17+
uses: actions/setup-python@v2
18+
with:
19+
python-version: ${{ matrix.python-version }}
20+
21+
- name: Display Python version
22+
run: python -c "import sys; print(sys.version)"
23+
24+
- name: Install poetry
25+
uses: abatilo/actions-poetry@v2.0.0
26+
27+
- name: Install poetry (and update) and pre-commit
28+
run: |
29+
poetry update
30+
poetry run pre-commit install
31+
32+
- name: Run pre-commit
33+
run: poetry run pre-commit run --all-files
34+
35+
- name: Run tests
36+
run: poetry run pytest
37+
38+
- name: Run Generator (BuildingSync 2.3)
39+
run: |
40+
curl -L -o bsyncpy/BuildingSync-2.3.xsd https://github.com/BuildingSync/schema/releases/download/v2.3.0/BuildingSync.xsd
41+
cd bsyncpy
42+
poetry run python bsyncpy_generator.py BuildingSync-2.3.xsd
43+
44+
- name: Run Generator (BuildingSync 2.4)
45+
run: |
46+
curl -L -o bsyncpy/BuildingSync-2.4.xsd https://github.com/BuildingSync/schema/releases/download/v2.4.0/BuildingSync.xsd
47+
cd bsyncpy
48+
poetry run python bsyncpy_generator.py BuildingSync-2.4.xsd
49+
50+
- name: Run Generator (BuildingSync Develop V2)
51+
run: |
52+
curl -L -o bsyncpy/BuildingSync-develop-v2.xsd https://raw.githubusercontent.com/BuildingSync/schema/develop-v2/BuildingSync.xsd
53+
cd bsyncpy
54+
poetry run python bsyncpy_generator.py BuildingSync-develop-v2.xsd
55+
56+
- name: Run Generator (BuildingSync Develop V3)
57+
run: |
58+
curl -L -o bsyncpy/BuildingSync-develop-v3.xsd https://raw.githubusercontent.com/BuildingSync/schema/develop-v3/BuildingSync.xsd
59+
cd bsyncpy
60+
poetry run python bsyncpy_generator.py BuildingSync-develop-v3.xsd

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ dist
1010
BuildingSync.xsd
1111
BuildingSync-*.xsd
1212
example.py
13-
output.xml
13+
output.xml

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 21.9b0 # Replace by any tag/version: https://github.com/psf/black/tags
3+
rev: 22.3.0
44
hooks:
55
- id: black
66
language_version: python3 # Should be a command that runs python3.6+

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# Version 0.2.0 (Unreleased)
1+
# Version 0.3.0.alpha.0
2+
3+
* Generated for BuildingSync 2.5 (which is currently develop-v2)
4+
* Added GHG emission metrics
5+
6+
# Version 0.2.0
27

38
* Generated for BuildingSync 2.4
49
* Renamed project folder to bsyncpy to follow Python package conventions

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,15 @@ Check out our example Jupyter Notebook [here](https://nbviewer.jupyter.org/githu
6161

6262
* See the notes above on downloading and generating the new bsync.py file.
6363
* Bump version in `pyproject.toml` file
64-
* Add CHANGELOG entry
64+
* Add/update CHANGELOG entry
6565
* Update (or add) generator test in `.github/ci.yml`
6666
* Update this README with the latest version of testing.
6767

6868
## Releasing New Version
6969

70-
* Merge everything down to `main`
70+
* Bump version using poetry by calling `poetry version X.Y.Z`
71+
* Make sure CHANGELOG.md is up to date
72+
* Create pull request to merge `develop` to `main`
7173
* `git tag <version>`. Version in the form of vX.Y.Z.
7274
* `git push --tags`.
7375
* Go to GitHub and convert the tag to a release.

0 commit comments

Comments
 (0)