feat: bump version to latest release +1 #69
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ah thanks for checking that!
Let's walk through it. I have branch main in a state I want to publish.
Then I do poetry version patch in that branch, locally. But I cannot push
to the main branch, so I create a new branch, and merge that into develop
via pull request, and then that into main via pull request? Seems really
convoluted...
I'll give you a call tomorrow, maybe we can walk through it together.
Thanks!
Ruud
…On Wed, 6 Dec 2023, 15:13 Stefan Keidel, ***@***.***> wrote:
It seems that the release pipeline failed because while new tags were
created, you forgot to bump the poetry version. The way CI is currently set
up in your repo, you will have to do that by hand still (poetry version
major|minor|patch)
------------------------------
You can view, comment on, or merge this pull request online at:
#69
Commit Summary
- 95770e0
<95770e0>
feat: bump version to latest release +1
File Changes
(2 files <https://github.com/rwijtvliet/portfolyo/pull/69/files>)
- *M* .gitignore
<https://github.com/rwijtvliet/portfolyo/pull/69/files#diff-bc37d034bad564583790a46f19d807abfe519c5671395fd494d8cce506c42947>
(2)
- *M* pyproject.toml
<https://github.com/rwijtvliet/portfolyo/pull/69/files#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711>
(2)
Patch Links:
- https://github.com/rwijtvliet/portfolyo/pull/69.patch
- https://github.com/rwijtvliet/portfolyo/pull/69.diff
—
Reply to this email directly, view it on GitHub
<#69>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AA7KOHMLNQZTBD53BWEQ5J3YIB4PZAVCNFSM6AAAAABAJOIW5WVHI2DSMVQWIX3LMV43ASLTON2WKOZSGAZDQNRVGI3DSMI>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
|
|
Package versioning is always a somewhat manual process, as it should be -- you as a maintainer are the one to decide how "major" the changes are. See also here: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow In theory, changes only get merged to main if and when you release, ideally from a release branch where you get to decide on the version. Whether or not that's done via PR is up to you -- you're the maintainer! |
|
I've tried to describe the process here - does it make sense like this? I know I'm the developer, but I do not have enough experience and just want to follow best practices. Some additional questions:
Thanks again! |
rwijtvliet
approved these changes
Dec 7, 2023
rwijtvliet
added a commit
that referenced
this pull request
Dec 7, 2023
|
Heyhey! For feature branch to develop, squashing absolutely makes sense generally. For everything else, rewriting history (which is what squashing is) is frowned upon. I would generally advise rebasing code on top so you have a clean, linear history. That will get rid of the diverging branch histories as well, and they will be in sync. As far as merging/rebasing release branches to both dev and main, I'm not super sure how to do that in practice either. I would probably rather do relese > main > develop, but likely without pull requests. But it remains to be seen what feels good for your workflow I guess. We usually forego the release branches and bump the package versions as part of feature commits to develop immediately. But if you tend to accumulate changes for a while before releasing that might obviously not be practical. Depends on your process :) |
rwijtvliet
added a commit
that referenced
this pull request
Feb 1, 2024
* better description of development process (#70) * Update README.rst (#71) * feat: bump version to latest release +1 (#69) * Wavgfix (#62) * initial commit * small fix * stash for the weekend * Fixed wavg to handle surplus values. * Re-instated 'Europe/Berlin' as default for tz in standardize. For now. * small fix in docs * docs and better unit handling * Kind available at project root * fixed init tests (?) * new release * fixed for pyton 3.9 too * additional tests (#74) * Portfolyo Release 0.5.10 (#75) --------- Co-authored-by: Stefan Keidel <1188614+stefankeidel@users.noreply.github.com>
rwijtvliet
added a commit
that referenced
this pull request
May 27, 2024
* better description of development process (#70) * Update README.rst (#71) * feat: bump version to latest release +1 (#69) * Wavgfix (#62) * initial commit * small fix * stash for the weekend * Fixed wavg to handle surplus values. * Re-instated 'Europe/Berlin' as default for tz in standardize. For now. * small fix in docs * docs and better unit handling * Kind available at project root * fixed init tests (?) * new release * fixed for pyton 3.9 too * additional tests (#74) * Portfolyo Release 0.5.10 (#75) * Slice (#78) * added slice property & tests * changed toml * fixed tz issue and added tz test for slicing * added test-cases with tz --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> * Standardise sod (#82) * refactoring and additional assertion on start-of-day * fixed test and assertion * fixed? * fixed some * not working * fixed some things * tests for slice * final test for slice for 15T * docs * try to fix docs * another try to fix * poetry shell * fixing 2.0 * fixing 2.1 * fixing 3.0 * fixing 4.0 * fixing 5.0 * fixing 6.0 * fixng 7.0 * fixng 8.0 * fixing 11 * fixing 12 * fixing 13 * fixng 14 * fixing 15 * fixing 16 * fixing 17 * deleted python 3.0 from tests * deleted hmtl folder * changed toml * updated lock file --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Concat (#83) * added slice property & tests * changed toml * created branch concat * first commit * works for flat pflines, nested not yet * draft of concat function done, need more testing though * created error_case tests for concat * wrote test_func for concat_pflines, improved the code for concat * added test cases for concat pfstates, requires approval(!) * changed test_function * change general to take iterable as argument --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Toplevelfunctions (#84) * initial commit * gitignore * Intersect (#79) * added slice property & tests * changed toml * created branch for intersect_flex function * new test function * added tests for intersect_flex frames * all test are passing * test ignore all for intersect frame * fixed documentation * deleted req docs * added DST testcase * not working help * Added back missing file * added valuerror for sod with less than daily freq * deleted unnecessary files * tests for indexable * tests for indexable with 2 obj * added oneliner in docs and test for 3 obj. case --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> * Plot children (#87) * changed to poetry * fixed pint problem (groups in unitdef.txt) and pint-pandas dependency problem by fixing pandas to 2.0 * ci pipeline * ci pipeline * ci with poetry * solve dependency problems between pandas and pint-pandas * workaround pint-pandas bug * typo * seaborn pinned version to 0.8 * fixed to_excel function, updated version of pint * fixed arithmatic on pflines without overlap * small changes small changes * more consistent functions to get random pfline * deleted comment * change the python version for push request to 3.11 * test * Removed unused dependency * updated toml * added exception if no clipboard available * updated toml * fixed pfline_excelclipboad.py * changed lock file for pre-commit * install poetry libraries in pre-commit step * use black on all files in pre-commit * updated flake8 version in pre-commit.yaml * exclude .venv folder from flake8 * changed setup.cfg to ignore flake8 error messages * initial commit * first try at plotting children * bar plot with children * created plot_children(),fixed bug with darken * area plots for children stacked on top of each other. for daily it plots only parent * changed the logic of all plot_timeseries_as functions, now based on frequency * created a function to test plotting pfline * created slice attr, wrote tests for it * more flexible intersec function with ignore freq, tz, start_of_day + tests * small changes to intersect * intersect_flex function is finished, more testing with frames needed * finished intersect_flex, more testing with frames needed * added children bool to plot pfstate * added hash function for colors for children * deleted unnecessary test * changed hash function, and width of hline * deleted unnecessary test * plot with children * changed plot_pfstate to work with new logic * tests for plot function * added function to set limits to plot pfstate * fixed strict variable for test cases * Deleted unnecessary files * changed yaml file to exclude python 3.10 with mac 14 --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Structure (#90) * changed to poetry * fixed pint problem (groups in unitdef.txt) and pint-pandas dependency problem by fixing pandas to 2.0 * ci pipeline * ci pipeline * ci with poetry * solve dependency problems between pandas and pint-pandas * workaround pint-pandas bug * typo * seaborn pinned version to 0.8 * fixed to_excel function, updated version of pint * fixed arithmatic on pflines without overlap * small changes small changes * more consistent functions to get random pfline * deleted comment * change the python version for push request to 3.11 * test * Removed unused dependency * updated toml * added exception if no clipboard available * updated toml * fixed pfline_excelclipboad.py * changed lock file for pre-commit * install poetry libraries in pre-commit step * use black on all files in pre-commit * updated flake8 version in pre-commit.yaml * exclude .venv folder from flake8 * changed setup.cfg to ignore flake8 error messages * initial commit * first try at plotting children * bar plot with children * created plot_children(),fixed bug with darken * area plots for children stacked on top of each other. for daily it plots only parent * changed the logic of all plot_timeseries_as functions, now based on frequency * created a function to test plotting pfline * created slice attr, wrote tests for it * more flexible intersec function with ignore freq, tz, start_of_day + tests * small changes to intersect * intersect_flex function is finished, more testing with frames needed * finished intersect_flex, more testing with frames needed * added children bool to plot pfstate * added hash function for colors for children * deleted unnecessary test * changed hash function, and width of hline * deleted unnecessary test * plot with children * changed plot_pfstate to work with new logic * tests for plot function * refactoring * more powerful peak/offpeak functions * removed longer_or_shorter from frequency tools; Use the up_or_down function instead * tests for peakfn and peakconvert * fixed test * removed all Union and replaced with | --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Portfolyo Release 0.6.0 * Portfolyo Release 0.6.0 (#91) * 0.6.0 (#93) * 0.6.0 (#94) --------- Co-authored-by: Stefan Keidel <1188614+stefankeidel@users.noreply.github.com> Co-authored-by: Alina Voilova <91426818+Pizza2Pizza@users.noreply.github.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de>
Pizza2Pizza
added a commit
that referenced
this pull request
May 28, 2024
* new release 0.6.0 (#92) * better description of development process (#70) * Update README.rst (#71) * feat: bump version to latest release +1 (#69) * Wavgfix (#62) * initial commit * small fix * stash for the weekend * Fixed wavg to handle surplus values. * Re-instated 'Europe/Berlin' as default for tz in standardize. For now. * small fix in docs * docs and better unit handling * Kind available at project root * fixed init tests (?) * new release * fixed for pyton 3.9 too * additional tests (#74) * Portfolyo Release 0.5.10 (#75) * Slice (#78) * added slice property & tests * changed toml * fixed tz issue and added tz test for slicing * added test-cases with tz --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> * Standardise sod (#82) * refactoring and additional assertion on start-of-day * fixed test and assertion * fixed? * fixed some * not working * fixed some things * tests for slice * final test for slice for 15T * docs * try to fix docs * another try to fix * poetry shell * fixing 2.0 * fixing 2.1 * fixing 3.0 * fixing 4.0 * fixing 5.0 * fixing 6.0 * fixng 7.0 * fixng 8.0 * fixing 11 * fixing 12 * fixing 13 * fixng 14 * fixing 15 * fixing 16 * fixing 17 * deleted python 3.0 from tests * deleted hmtl folder * changed toml * updated lock file --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Concat (#83) * added slice property & tests * changed toml * created branch concat * first commit * works for flat pflines, nested not yet * draft of concat function done, need more testing though * created error_case tests for concat * wrote test_func for concat_pflines, improved the code for concat * added test cases for concat pfstates, requires approval(!) * changed test_function * change general to take iterable as argument --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Toplevelfunctions (#84) * initial commit * gitignore * Intersect (#79) * added slice property & tests * changed toml * created branch for intersect_flex function * new test function * added tests for intersect_flex frames * all test are passing * test ignore all for intersect frame * fixed documentation * deleted req docs * added DST testcase * not working help * Added back missing file * added valuerror for sod with less than daily freq * deleted unnecessary files * tests for indexable * tests for indexable with 2 obj * added oneliner in docs and test for 3 obj. case --------- Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> * Plot children (#87) * changed to poetry * fixed pint problem (groups in unitdef.txt) and pint-pandas dependency problem by fixing pandas to 2.0 * ci pipeline * ci pipeline * ci with poetry * solve dependency problems between pandas and pint-pandas * workaround pint-pandas bug * typo * seaborn pinned version to 0.8 * fixed to_excel function, updated version of pint * fixed arithmatic on pflines without overlap * small changes small changes * more consistent functions to get random pfline * deleted comment * change the python version for push request to 3.11 * test * Removed unused dependency * updated toml * added exception if no clipboard available * updated toml * fixed pfline_excelclipboad.py * changed lock file for pre-commit * install poetry libraries in pre-commit step * use black on all files in pre-commit * updated flake8 version in pre-commit.yaml * exclude .venv folder from flake8 * changed setup.cfg to ignore flake8 error messages * initial commit * first try at plotting children * bar plot with children * created plot_children(),fixed bug with darken * area plots for children stacked on top of each other. for daily it plots only parent * changed the logic of all plot_timeseries_as functions, now based on frequency * created a function to test plotting pfline * created slice attr, wrote tests for it * more flexible intersec function with ignore freq, tz, start_of_day + tests * small changes to intersect * intersect_flex function is finished, more testing with frames needed * finished intersect_flex, more testing with frames needed * added children bool to plot pfstate * added hash function for colors for children * deleted unnecessary test * changed hash function, and width of hline * deleted unnecessary test * plot with children * changed plot_pfstate to work with new logic * tests for plot function * added function to set limits to plot pfstate * fixed strict variable for test cases * Deleted unnecessary files * changed yaml file to exclude python 3.10 with mac 14 --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Structure (#90) * changed to poetry * fixed pint problem (groups in unitdef.txt) and pint-pandas dependency problem by fixing pandas to 2.0 * ci pipeline * ci pipeline * ci with poetry * solve dependency problems between pandas and pint-pandas * workaround pint-pandas bug * typo * seaborn pinned version to 0.8 * fixed to_excel function, updated version of pint * fixed arithmatic on pflines without overlap * small changes small changes * more consistent functions to get random pfline * deleted comment * change the python version for push request to 3.11 * test * Removed unused dependency * updated toml * added exception if no clipboard available * updated toml * fixed pfline_excelclipboad.py * changed lock file for pre-commit * install poetry libraries in pre-commit step * use black on all files in pre-commit * updated flake8 version in pre-commit.yaml * exclude .venv folder from flake8 * changed setup.cfg to ignore flake8 error messages * initial commit * first try at plotting children * bar plot with children * created plot_children(),fixed bug with darken * area plots for children stacked on top of each other. for daily it plots only parent * changed the logic of all plot_timeseries_as functions, now based on frequency * created a function to test plotting pfline * created slice attr, wrote tests for it * more flexible intersec function with ignore freq, tz, start_of_day + tests * small changes to intersect * intersect_flex function is finished, more testing with frames needed * finished intersect_flex, more testing with frames needed * added children bool to plot pfstate * added hash function for colors for children * deleted unnecessary test * changed hash function, and width of hline * deleted unnecessary test * plot with children * changed plot_pfstate to work with new logic * tests for plot function * refactoring * more powerful peak/offpeak functions * removed longer_or_shorter from frequency tools; Use the up_or_down function instead * tests for peakfn and peakconvert * fixed test * removed all Union and replaced with | --------- Co-authored-by: rwijtvliet <rwijtvliet@gmail.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * Portfolyo Release 0.6.0 * Portfolyo Release 0.6.0 (#91) * 0.6.0 (#93) * 0.6.0 (#94) --------- Co-authored-by: Stefan Keidel <1188614+stefankeidel@users.noreply.github.com> Co-authored-by: Alina Voilova <91426818+Pizza2Pizza@users.noreply.github.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de> * tests using fixtures * cov report --------- Co-authored-by: Stefan Keidel <1188614+stefankeidel@users.noreply.github.com> Co-authored-by: Alina Voilova <91426818+Pizza2Pizza@users.noreply.github.com> Co-authored-by: Alina Voilova <alina.voilova@lichtblick.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It seems that the release pipeline failed because while new tags were created, you forgot to bump the poetry version. The way CI is currently set up in your repo, you will have to do that by hand still (
poetry version major|minor|patch)📚 Documentation preview 📚: https://portfolyo--69.org.readthedocs.build/en/69/