-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
PR Update README
, RELEASE
and Announcements
files
#22183
base: master
Are you sure you want to change the base?
PR Update README
, RELEASE
and Announcements
files
#22183
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @dalthviz for your work on this!
RELEASE.md
Outdated
git checkout 5.x | ||
git fetch upstream | ||
git merge upstream/5.x | ||
git checkout master | ||
git merge 5.x | ||
Merge from 5.x: PR #xxxxx | ||
git push upstream master |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we should remove these lines because they'll need to be restored once we create the 6.x
branch. And translations should be updated for the currently stable branch, not for master.
RELEASE.md
Outdated
* git checkout master | ||
|
||
* git merge 5.x | ||
|
||
* git commit -m "Release X.X.X [ci skip]" | ||
* `git push upstream master` | ||
|
||
* git push upstream master | ||
|
||
* git push upstream 5.x | ||
|
||
* git push upstream --tags |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These commands will be necessary once we start to do releases from 6.x
. But I think it's fine to remove them in master
because they are not needed in this branch.
|
||
* Update Binder related elements when the new Spyder version is available in Conda-forge: | ||
- Update the Spyder version on the environment file ([`binder/environment.yml`](https://github.com/spyder-ide/binder-environments/blob/spyder-stable/binder/environment.yml)) of the ([`spyder-stable` branch](https://github.com/spyder-ide/binder-environments/tree/spyder-stable)) in the `binder-environments` repo. | ||
- Update `environment.yml` files of the [`master`](https://github.com/spyder-ide/binder-environments/blob/master/binder/environment.yml) and [`5.x`](https://github.com/spyder-ide/binder-environments/blob/5.x/binder/environment.yml) branches of `binder-environments` with the contents of the `binder/environment.yml` file present on this repo. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Leaving a comment here to not forget to restore this part
[`6.x`](https://github.com/spyder-ide/binder-environments/blob/6.x/binder/environment.yml)`
once 6.0 is released.
Co-authored-by: Carlos Cordoba <ccordoba12@gmail.com>
Description of Changes
Basic changes to docs/processes files:
Affirmation
By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.
I certify the above statement is true and correct: dalthviz