Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add documentation of versioning/branches to main README #163

Merged
merged 3 commits into from
Jan 10, 2020

Conversation

Zsailer
Copy link
Member

@Zsailer Zsailer commented Jan 3, 2020

Adds language around versioning.

Also bumps master to 0.3.0.dev.

@Zsailer Zsailer changed the title Add documentation of versioning/brancges to main README Add documentation of versioning/branches to main README Jan 3, 2020
@Zsailer
Copy link
Member Author

Zsailer commented Jan 3, 2020

Waiting on #162 to get merged.

@echarles
Copy link
Member

echarles commented Jan 9, 2020

What is the impact on the PR merge. E.g. a new feature is developed for next release 0.3.0:

  1. Do we merge in both master and 0.3.0 branche(s)?
  2. ...or do we we merge only in 0.3.0 and then before the release merge all in master?
  3. ... or merge in master as now and create a 0.3.0 for the release?

I prefer option 3 for simplicity.

@rolweber
Copy link
Contributor

rolweber commented Jan 9, 2020

I fully agree. Features should be developed for master. Release branches should get created with or after the release. When the release is properly tagged, branch creation can be delayed until there's a need for the branch.

Copy link
Member

@kevin-bates kevin-bates left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Zach - this will be very helpful. I just had a couple comments.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@Zsailer
Copy link
Member Author

Zsailer commented Jan 9, 2020

Thanks, all!

  1. ... or merge in master as now and create a 0.3.0 for the release?

Yes, this is what I intended. I think @kevin-bates inline comment will help clarify this. Master represents the latest minor version. We won't create a branch for the latest version until we release that branch on PyPI. Once we make a release, we bump the version in master and add features there.

@Zsailer
Copy link
Member Author

Zsailer commented Jan 9, 2020

Ok, modified the language to reflect that we're only creating branches once a version is released. Let me know if you think this needs anymore editting.

Copy link
Member

@kevin-bates kevin-bates left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thank you.

@echarles echarles self-requested a review January 10, 2020 07:08
@echarles echarles merged commit e8f1f60 into jupyter-server:master Jan 10, 2020
@Zsailer Zsailer deleted the versioning branch January 10, 2020 17:34
@Zsailer Zsailer restored the versioning branch August 4, 2020 15:53
Zsailer pushed a commit to Zsailer/jupyter_server that referenced this pull request Nov 18, 2022
* add session expiration handling

* cleanup

* use host name for cookie

* finish extension

* cleanup

* fix comment

* fix comment

* update tests
hMED22 pushed a commit to hMED22/jupyter_server that referenced this pull request Jan 23, 2023
…er#163)

* update readme to explain versioning

* add detail to versioning docs

* clarify language in README on versioning and bump version
@Zsailer Zsailer deleted the versioning branch January 16, 2024 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants