Changes between Version 3 and Version 4 of DRM4G/Development


Ignore:
Timestamp:
Dec 7, 2016 1:48:40 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v3 v4  
    135135git checkout master
    136136git merge --squash DRM4G-X.X.X
     137git commit -v
    137138git tag X.X.X
    138 git commit -v
    139139git push origin master
    140140git push origin --tags
     
    145145* Squashing all the commits when doing the merge, will ensure that every commit in the master is a stable version and will make the log history cleaner, allowing use to easily see the changes made between commits.
    146146
    147 Updating the '''develop''' will be a bit different.  If it is ever needed to rollback to a previous version, its commit has to be accessible. So merges to the '''develop''' branch won't be 'squashed''.
     147Updating the '''develop''' will be a bit different.  If it is ever needed to rollback to a previous version, its commit has to be accessible. So merges to the '''develop''' branch won't be ''squashed''.
     148
     149{{{#!sh
     150git checkout develop
     151git merge --no-ff DRM4G-X.X.X
     152git tag X.X.X
     153git push origin develop
     154git push origin --tags
     155git push github develop
     156git push github --tags
     157}}}
    148158
    149159
     
    154164
    155165After having updated the '''master''', it's time to publish the release.
    156 1. First, the package has to be uploaded to PyPI, there's a few ways to do this, but you'll need to have an account with access to the groups PyPI page.
     1661. First, the package has to be uploaded to PyPI, there's a few ways to do this, but you'll need to have an account with access to the groups [https://pypi.python.org/pypi/drm4g PyPI page].
     1671. Run the command `python setup.py register` or modify your [https://docs.python.org/2/distutils/packageindex.html#pypirc $HOME/.pypirc file] and add your credentials to be able to submit package data to PyPI.
     168 * This step is only needed the first time.
     1691. Finally submit the distribution files.
    157170 * Run the command `python setup.py sdist upload` [[br]] ''or''
    158171 * Run the command `python setup.py sdist` and then upload the package though PyPI's user interface.
    159 1.
    160 1.