diff --git a/.github/workflows/semantic_prerelease.yaml b/.github/workflows/semantic_prerelease.yaml index 6379eaa1..24dea9fd 100644 --- a/.github/workflows/semantic_prerelease.yaml +++ b/.github/workflows/semantic_prerelease.yaml @@ -9,3 +9,5 @@ jobs: Semantic-Pre-Release: uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main + with: + PRE_RELEASE: true diff --git a/.github/workflows/semantic_release.yaml b/.github/workflows/semantic_release.yaml index 448debf3..2fc8f322 100644 --- a/.github/workflows/semantic_release.yaml +++ b/.github/workflows/semantic_release.yaml @@ -6,4 +6,6 @@ on: jobs: Semantic-Release: - uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main \ No newline at end of file + uses: MyElectricalData/.github/.github/workflows/python_semantic_release.yaml@main + with: + PRE_RELEASE: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f95f50f..ba3e4b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,38 +1,6 @@ # CHANGELOG - -## v0.1.0 (2024-02-04) - -### Chore - -* chore: clean ([`5e1c2dd`](https://github.com/MyElectricalData/myelectricaldata_import/commit/5e1c2dda28a8471a395134cb0bd10f7e8750d862)) - -### Ci - -* ci: run ci only on PR to main ([`2dfb992`](https://github.com/MyElectricalData/myelectricaldata_import/commit/2dfb99216a7120a14af9b10cdfbcdb25cdef3938)) - -### Unknown - -* Merge pull request #482 from MyElectricalData/vingerha-main - -chore: clean ([`211c2db`](https://github.com/MyElectricalData/myelectricaldata_import/commit/211c2db1e6e4e57dd6c9a29b242507b5d35b2a63)) - -* Merge pull request #481 from vingerha/main - -Fix: get_week ([`988b9a6`](https://github.com/MyElectricalData/myelectricaldata_import/commit/988b9a69ea7518e0a264cce6a1621bae1ee99442)) - -* Fix: typo in get_week - -now instead of now() ([`6c96e78`](https://github.com/MyElectricalData/myelectricaldata_import/commit/6c96e784c958b9ea334be0ec99f17f0fccacf141)) - -* Merge branch 'main' of https://github.com/vingerha/myelectricaldata ([`0bfaa5e`](https://github.com/MyElectricalData/myelectricaldata_import/commit/0bfaa5e6f7120236798337e6cb3c8a092377fce7)) - -* Fix get_week - -Base on 'today' and adapt for leap-year situation ([`55b4e6e`](https://github.com/MyElectricalData/myelectricaldata_import/commit/55b4e6ee1d59742d9522411088d0d739187b29c1)) - - ## v0.10.0-rc.22 (2024-01-30) ### Feature @@ -778,7 +746,7 @@ Fix last5days, add max_power to HA ([`063af0b`](https://github.com/MyElectricalD * Update export_home_assistant.py -J'aurais tendance à préférer cette méthode. +J'aurais tendance à préférer cette méthode. Dit moi si ca fonctionne tjr chez toi. ([`d5a983e`](https://github.com/MyElectricalData/myelectricaldata_import/commit/d5a983e538eaf68ed70259bb088516fe7839f56e)) * Update stat.py ([`b50892c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/b50892cfe52a04ef674c69acd1fd72731423eaf2)) @@ -797,9 +765,9 @@ Allow to extracte truefalse, if max_power is over subscribed power ([`5678328`]( * Added max_power, fix for last5days -Last5days: was not exporting the whole of 'yesterday' as referring to the current (today) time of day, removed the issue -Max_power: export max_power for past 7 days -Max_power_over: export where max power is 'over' subscribed power (has dependency with stats.py update) +Last5days: was not exporting the whole of 'yesterday' as referring to the current (today) time of day, removed the issue +Max_power: export max_power for past 7 days +Max_power_over: export where max power is 'over' subscribed power (has dependency with stats.py update) mp and mpo can be use in HA with Apexcharts and Saniho card (if accepted by Saniho) ([`ec31e33`](https://github.com/MyElectricalData/myelectricaldata_import/commit/ec31e33d771eb97d8c39d21c7a2dfdca4077881d)) * Fix max date detail ([`a8f8c2a`](https://github.com/MyElectricalData/myelectricaldata_import/commit/a8f8c2a1a3a698b50aa779ac667a6879bc792d7e)) diff --git a/Makefile b/Makefile index 4b17cf8e..06df0018 100755 --- a/Makefile +++ b/Makefile @@ -108,11 +108,11 @@ debug: init enable_debug up bootstrap down ## Start all external ressource necessary to debug (MQTT, InfluxDB,...) up: - cd dev; docker compose up --force-recreate --detach; cd - + docker compose -f dev/docker-compose.dev.yaml start ## Stop all external ressource necessary to debug (MQTT, InfluxDB,...) down: - docker compose down + docker compose -f dev/docker-compose.dev.yaml stop ## Run PyTest only test: pytest diff --git a/pyproject.toml b/pyproject.toml index d81848cc..0c2f61dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "myelectricaldata-import" -version = "0.1.0" +version = "0.10.0-rc.22" description = "MyElectricalData official client" authors = ["Clément VALENTIN "] readme = "README.md" @@ -76,12 +76,8 @@ version_variables = [ [tool.semantic_release.branches.main] match = "(main|master)" -prerelease = false - -[tool.semantic_release.branches."*"] -match = ".*" -prerelease = true prerelease_token = "rc" +prerelease = true [tool.semantic_release.changelog] template_dir = "templates"