From 688f5710dc439d79cab01d63a67b2c86a0b7a9d3 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 17 Dec 2024 14:48:57 -0700 Subject: [PATCH 1/4] bump to v0.9.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 625bf2adc..5618d03d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geojson-modelica-translator" -version = "0.9.0" +version = "0.9.1" description = "Package for converting GeoJSON to Modelica models for urban scale analyses." authors = ["URBANopt DES Team "] license = "BSD-4-Clause" From 0b0b74af7892e9732d3955cf84578258108bd733 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 17 Dec 2024 14:49:11 -0700 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb7ff3d8..ef17905b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## Version 0.9.1 + +* Fix incorrect link to documentation site by @vtnate + ## Version 0.9.0 ### Exciting New Features 🎉 From 23ad74825f5850cc5f9d695de874cd71b5f3491e Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 17 Dec 2024 15:29:43 -0700 Subject: [PATCH 3/4] use specific GHA workflow to deploy docs --- .github/workflows/documentation_site.yml | 31 ++++++------------------ docs/docs_requirements.txt | 4 +++ pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 25 deletions(-) create mode 100644 docs/docs_requirements.txt diff --git a/.github/workflows/documentation_site.yml b/.github/workflows/documentation_site.yml index b049894a1..53db840de 100644 --- a/.github/workflows/documentation_site.yml +++ b/.github/workflows/documentation_site.yml @@ -5,33 +5,16 @@ on: - main paths: - docs/** - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -permissions: - contents: write jobs: deploy: runs-on: ubuntu-latest - environment: - name: github-pages - steps: - uses: actions/checkout@v4 - - name: Configure Git Credentials - run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com - - uses: actions/setup-python@v5 - with: - python-version: 3.13 - - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV - - uses: actions/cache@v4 - with: - key: mkdocs-material-${{ env.cache_id }} - path: .cache - restore-keys: | - mkdocs-material- - - run: pip install mkdocs-material mkdocs-schema-reader mkdocstrings-python markdown-include - - run: mkdocs gh-deploy --force + - name: Deploy docs + uses: mhausenblas/mkdocs-deploy-gh-pages@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CUSTOM_DOMAIN: https://docs.urbanopt.net/geojson-modelica-translator/ + CONFIG_FILE: mkdocs.yml + REQUIREMENTS: docs/docs_requirements.txt diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt new file mode 100644 index 000000000..3c18a3223 --- /dev/null +++ b/docs/docs_requirements.txt @@ -0,0 +1,4 @@ +markdown-include~=0.8.1 +mkdocs-material~=9.5.49 +mkdocs-schema-reader~=0.11.1 +mkdocstrings-python~=1.12.2" diff --git a/pyproject.toml b/pyproject.toml index 5618d03d5..3113b491e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ pytest = "~7.4" pytest-cov = "~4.1" syrupy = "~4.6" toml = "~0.10" -# documentation +# documentation - these are used during development of docs, not deployment markdown-include = "~0.8.1" mkdocs-material = "~9.5" mkdocs-schema-reader = "~0.11.1" From 1b1aae170b53821c3748eb754b9842d1ce25c66f Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 17 Dec 2024 15:50:35 -0700 Subject: [PATCH 4/4] set version to 0.9.1-rc1 to test docs deployment --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3113b491e..3709c94ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geojson-modelica-translator" -version = "0.9.1" +version = "0.9.1-rc1" description = "Package for converting GeoJSON to Modelica models for urban scale analyses." authors = ["URBANopt DES Team "] license = "BSD-4-Clause"