* [gentoo-portage-dev] New portage version with latest fixes in git is needed @ 2014-01-04 14:28 Pacho Ramos 2014-01-04 14:56 ` Brian Dolbec 0 siblings, 1 reply; 18+ messages in thread From: Pacho Ramos @ 2014-01-04 14:28 UTC (permalink / raw To: gentoo-portage-dev Hello I think this was pointed some days ago, but would be nice (and needed) to get a newer portage version including fixes from git, some of them important like: https://bugs.gentoo.org/show_bug.cgi?id=490362 Not sure if I can contribute with something on this, but if you thing so, please let me know Thanks! ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] New portage version with latest fixes in git is needed 2014-01-04 14:28 [gentoo-portage-dev] New portage version with latest fixes in git is needed Pacho Ramos @ 2014-01-04 14:56 ` Brian Dolbec 2014-01-04 15:03 ` Mike Frysinger 2014-01-04 21:53 ` [gentoo-portage-dev] New portage version with latest fixes in git is needed Sebastian Luther 0 siblings, 2 replies; 18+ messages in thread From: Brian Dolbec @ 2014-01-04 14:56 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: text/plain, Size: 586 bytes --] On Sat, 2014-01-04 at 15:28 +0100, Pacho Ramos wrote: > Hello > > I think this was pointed some days ago, but would be nice (and needed) > to get a newer portage version including fixes from git, some of them > important like: > https://bugs.gentoo.org/show_bug.cgi?id=490362 > > Not sure if I can contribute with something on this, but if you thing > so, please let me know > > Thanks! > > Yes, I planned to get it out this weekend, if all goes well. There are one or two more patches to apply. Then I'll start packaging it. Is everyone else in agreement? [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 620 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] New portage version with latest fixes in git is needed 2014-01-04 14:56 ` Brian Dolbec @ 2014-01-04 15:03 ` Mike Frysinger 2014-01-04 21:49 ` Sebastian Luther 2014-01-04 21:53 ` [gentoo-portage-dev] New portage version with latest fixes in git is needed Sebastian Luther 1 sibling, 1 reply; 18+ messages in thread From: Mike Frysinger @ 2014-01-04 15:03 UTC (permalink / raw To: gentoo-portage-dev; +Cc: Brian Dolbec [-- Attachment #1: Type: Text/Plain, Size: 785 bytes --] On Saturday 04 January 2014 09:56:28 Brian Dolbec wrote: > On Sat, 2014-01-04 at 15:28 +0100, Pacho Ramos wrote: > > I think this was pointed some days ago, but would be nice (and needed) > > to get a newer portage version including fixes from git, some of them > > important like: > > https://bugs.gentoo.org/show_bug.cgi?id=490362 > > > > Not sure if I can contribute with something on this, but if you thing > > so, please let me know > > Yes, I planned to get it out this weekend, if all goes well. > > There are one or two more patches to apply. Then I'll start packaging > it. > > Is everyone else in agreement? we should document the release process. ideally, it should be as simple as: make dist PV=2.1.8 and even: make distcheck PV=2.1.8 -mike [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] New portage version with latest fixes in git is needed 2014-01-04 15:03 ` Mike Frysinger @ 2014-01-04 21:49 ` Sebastian Luther 2014-01-04 22:09 ` Sebastian Luther 2014-01-05 15:25 ` [gentoo-portage-dev] [PATCH] document release process Mike Frysinger 0 siblings, 2 replies; 18+ messages in thread From: Sebastian Luther @ 2014-01-04 21:49 UTC (permalink / raw To: gentoo-portage-dev Am 04.01.2014 16:03, schrieb Mike Frysinger: > On Saturday 04 January 2014 09:56:28 Brian Dolbec wrote: >> On Sat, 2014-01-04 at 15:28 +0100, Pacho Ramos wrote: >>> I think this was pointed some days ago, but would be nice (and >>> needed) to get a newer portage version including fixes from >>> git, some of them important like: >>> https://bugs.gentoo.org/show_bug.cgi?id=490362 >>> >>> Not sure if I can contribute with something on this, but if you >>> thing so, please let me know >> >> Yes, I planned to get it out this weekend, if all goes well. >> >> There are one or two more patches to apply. Then I'll start >> packaging it. >> >> Is everyone else in agreement? > > we should document the release process. ideally, it should be as > simple as: make dist PV=2.1.8 > > and even: make distcheck PV=2.1.8 -mike > There is mkrelease.sh in the portage repo. The following commands creates a portage-2.2.7.tar.bz2 that's almost identical to the one released by Zac (Changelog differs): $ ./mkrelease.sh --changelog-rev v2.2.6 -t 2.2.7 2.2.7 The first argument states where the Changelog entries should begin (tag v2.2.6 in this case). The second argument is the tag to create the tarball from. The third argument is the new version. I don't know how Zac choose the --changelog-rev parameter. That's why the Changelog is different. For 2.2.8 the process should look like: * Create a tag named v2.2.8. * ./mkrelease.sh --changelog-rev ???? -t 2.2.8 2.2.8 * Upload the tarball somewhere * Copy the ebuild (adjust SRC_URI) Sebastian ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] New portage version with latest fixes in git is needed 2014-01-04 21:49 ` Sebastian Luther @ 2014-01-04 22:09 ` Sebastian Luther 2014-01-05 15:25 ` [gentoo-portage-dev] [PATCH] document release process Mike Frysinger 1 sibling, 0 replies; 18+ messages in thread From: Sebastian Luther @ 2014-01-04 22:09 UTC (permalink / raw To: gentoo-portage-dev Am 04.01.2014 22:49, schrieb Sebastian Luther: > Am 04.01.2014 16:03, schrieb Mike Frysinger: >> On Saturday 04 January 2014 09:56:28 Brian Dolbec wrote: >>> On Sat, 2014-01-04 at 15:28 +0100, Pacho Ramos wrote: >>>> I think this was pointed some days ago, but would be nice (and >>>> needed) to get a newer portage version including fixes from >>>> git, some of them important like: >>>> https://bugs.gentoo.org/show_bug.cgi?id=490362 >>>> >>>> Not sure if I can contribute with something on this, but if you >>>> thing so, please let me know >>> >>> Yes, I planned to get it out this weekend, if all goes well. >>> >>> There are one or two more patches to apply. Then I'll start >>> packaging it. >>> >>> Is everyone else in agreement? >> >> we should document the release process. ideally, it should be as >> simple as: make dist PV=2.1.8 >> >> and even: make distcheck PV=2.1.8 -mike >> > > There is mkrelease.sh in the portage repo. > > The following commands creates a portage-2.2.7.tar.bz2 that's almost > identical to the one released by Zac (Changelog differs): > > $ ./mkrelease.sh --changelog-rev v2.2.6 -t 2.2.7 2.2.7 > > The first argument states where the Changelog entries should begin > (tag v2.2.6 in this case). > The second argument is the tag to create the tarball from. > The third argument is the new version. > > I don't know how Zac choose the --changelog-rev parameter. That's why > the Changelog is different. > > For 2.2.8 the process should look like: * Run ./runtests.sh. Make sure you have all supported python versions installed (2.6, 2.7, 3.2, 3.3). > * Create a tag named v2.2.8. > * ./mkrelease.sh --changelog-rev ???? -t 2.2.8 2.2.8 > * Upload the tarball somewhere > * Copy the ebuild (adjust SRC_URI) * Close the bugs blocking the tracker: https://bugs.gentoo.org/484436 > > > Sebastian > > > > > > ^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-portage-dev] [PATCH] document release process 2014-01-04 21:49 ` Sebastian Luther 2014-01-04 22:09 ` Sebastian Luther @ 2014-01-05 15:25 ` Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger 2014-01-05 17:53 ` [gentoo-portage-dev] [PATCH] document release process Brian Dolbec 1 sibling, 2 replies; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 15:25 UTC (permalink / raw To: gentoo-portage-dev --- DEVELOPING | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/DEVELOPING b/DEVELOPING index 5f15e15..5dfd9b7 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -160,3 +160,28 @@ The NO example just imports a set of functions from the output module. It is somewhat annoying because the import line needs to be modified when functions are needed and often unused functions are left in the import line until someone comes along with a linter to clean up (does not happen often). + +Releases +-------- + +First create a git tag for this release: + git tag v2.2.8 + +Then create the tarball: + ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 + +Unpack the tarball and run tests: + ./runtests.sh +Make sure you have all supported python versions installed: + 2.6 2.7 3.2 3.3 + +Version bump the ebuild and verify it can re-install itself: + emerge portage + emerge portage + +Publish the results (no going back now): + - Push the new git tag + - Upload the tarball + - Commit the new ebuild version + +Close the bugs blocking the tracker bug for this release. -- 1.8.4.3 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut 2014-01-05 15:25 ` [gentoo-portage-dev] [PATCH] document release process Mike Frysinger @ 2014-01-05 15:50 ` Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found Mike Frysinger ` (2 more replies) 2014-01-05 17:53 ` [gentoo-portage-dev] [PATCH] document release process Brian Dolbec 1 sibling, 3 replies; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 15:50 UTC (permalink / raw To: gentoo-portage-dev This keeps the list of supported versions in one place so people can do: ./runtests.sh --python-versions=supported No need to hardcode the list of python versions in multiple places. --- DEVELOPING | 6 +++--- runtests.sh | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/DEVELOPING b/DEVELOPING index 5dfd9b7..7aac81b 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -171,9 +171,9 @@ Then create the tarball: ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 Unpack the tarball and run tests: - ./runtests.sh -Make sure you have all supported python versions installed: - 2.6 2.7 3.2 3.3 + ./runtests.sh --python-versions=supported +Make sure you have all supported python versions installed first +(see PYTHON_SUPPORTED_VERSIONS in runtests.sh). Version bump the ebuild and verify it can re-install itself: emerge portage diff --git a/runtests.sh b/runtests.sh index 010a7bf..3006be5 100755 --- a/runtests.sh +++ b/runtests.sh @@ -2,6 +2,8 @@ # Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# These are the versions we care about. The rest are just "nice to have". +PYTHON_SUPPORTED_VERSIONS="2.6 2.7 3.2 3.3" PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0 3.1 3.2 3.3 3.4" # has to be run from portage root dir @@ -44,6 +46,9 @@ while [ $# -gt 0 ] ; do esac shift done +if [[ ${PYTHON_VERSIONS} == "supported" ]] ; then + PYTHON_VERSIONS=${PYTHON_SUPPORTED_VERSIONS} +fi set -- "${unused_args[@]}" -- 1.8.4.3 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger @ 2014-01-05 15:50 ` Mike Frysinger 2014-01-05 18:06 ` Brian Dolbec 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut Mike Frysinger 2014-01-05 17:58 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Brian Dolbec 2 siblings, 1 reply; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 15:50 UTC (permalink / raw To: gentoo-portage-dev This way people don't have to worry about runtests.sh passing for a specific version when it wasn't found in the system. --- runtests.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runtests.sh b/runtests.sh index 3006be5..2870907 100755 --- a/runtests.sh +++ b/runtests.sh @@ -30,15 +30,18 @@ interrupted() { trap interrupted SIGINT unused_args=() +IGNORE_MISSING_VERSIONS=true while [ $# -gt 0 ] ; do case "$1" in --python-versions=*) PYTHON_VERSIONS=${1#--python-versions=} + IGNORE_MISSING_VERSIONS=false ;; --python-versions) shift PYTHON_VERSIONS=$1 + IGNORE_MISSING_VERSIONS=false ;; *) unused_args[${#unused_args[@]}]=$1 @@ -73,6 +76,9 @@ for version in ${PYTHON_VERSIONS}; do exit_status="1" fi echo + elif [[ ${IGNORE_MISSING_VERSIONS} != "true" ]] ; then + echo -e "${BAD}Could not find requested Python ${version}${NORMAL}" + exit_status="1" fi done -- 1.8.4.3 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found Mike Frysinger @ 2014-01-05 18:06 ` Brian Dolbec 0 siblings, 0 replies; 18+ messages in thread From: Brian Dolbec @ 2014-01-05 18:06 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: text/plain, Size: 1145 bytes --] On Sun, 2014-01-05 at 10:50 -0500, Mike Frysinger wrote: > This way people don't have to worry about runtests.sh passing for a > specific version when it wasn't found in the system. > --- > runtests.sh | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/runtests.sh b/runtests.sh > index 3006be5..2870907 100755 > --- a/runtests.sh > +++ b/runtests.sh > @@ -30,15 +30,18 @@ interrupted() { > trap interrupted SIGINT > > unused_args=() > +IGNORE_MISSING_VERSIONS=true > > while [ $# -gt 0 ] ; do > case "$1" in > --python-versions=*) > PYTHON_VERSIONS=${1#--python-versions=} > + IGNORE_MISSING_VERSIONS=false > ;; > --python-versions) > shift > PYTHON_VERSIONS=$1 > + IGNORE_MISSING_VERSIONS=false > ;; > *) > unused_args[${#unused_args[@]}]=$1 > @@ -73,6 +76,9 @@ for version in ${PYTHON_VERSIONS}; do > exit_status="1" > fi > echo > + elif [[ ${IGNORE_MISSING_VERSIONS} != "true" ]] ; then > + echo -e "${BAD}Could not find requested Python ${version}${NORMAL}" > + exit_status="1" > fi > done > looks good to me, do it :) [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 620 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found Mike Frysinger @ 2014-01-05 15:50 ` Mike Frysinger 2014-01-05 18:04 ` Sebastian Luther 2014-01-05 18:23 ` Brian Dolbec 2014-01-05 17:58 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Brian Dolbec 2 siblings, 2 replies; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 15:50 UTC (permalink / raw To: gentoo-portage-dev This automates the release+test cycle a bit so people don't have to do it all by hand. --- DEVELOPING | 7 ++----- mkrelease.sh | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/DEVELOPING b/DEVELOPING index 7aac81b..b704a50 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -167,11 +167,8 @@ Releases First create a git tag for this release: git tag v2.2.8 -Then create the tarball: - ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 - -Unpack the tarball and run tests: - ./runtests.sh --python-versions=supported +Then create the tarball and run the tests: + ./mkrelease.sh --changelog-rev v2.2.7 --tag --runtests 2.2.8 Make sure you have all supported python versions installed first (see PYTHON_SUPPORTED_VERSIONS in runtests.sh). diff --git a/mkrelease.sh b/mkrelease.sh index 50bdb3c..334b4fb 100755 --- a/mkrelease.sh +++ b/mkrelease.sh @@ -8,9 +8,10 @@ BRANCH=${BRANCH:-master} USE_TAG=false CHANGELOG_REVISION= UPLOAD_LOCATION= +RUNTESTS=false usage() { - echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] <version>" + echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] [--runtests] <version>" exit ${1:-0} } @@ -19,7 +20,7 @@ die() { usage 1 } -ARGS=$(getopt -o htu: --long help,changelog-rev:,tag,upload: \ +ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload: \ -n "${0##*/}" -- "$@") [ $? != 0 ] && die "initialization error" @@ -42,6 +43,10 @@ while true; do -h|--help) usage ;; + --runtests) + RUNTESTS=true + shift + ;; --) shift break @@ -78,6 +83,12 @@ cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,misc,pym} "${RELEASE_DIR}/" || die "direc cp "${SOURCE_DIR}/"{DEVELOPING,LICENSE,Makefile,NEWS,README,RELEASE-NOTES,TEST-NOTES} \ "${RELEASE_DIR}/" || die "file copy failed" +if [[ ${RUNTESTS} == "true" ]] ; then + pushd "${SOURCE_DIR}" >/dev/null + ./runtests.sh --python-versions=supported || die "tests failed" + popd >/dev/null +fi + rm -rf "${SOURCE_DIR}" || die "directory cleanup failed" echo ">>> Setting portage.VERSION" -- 1.8.4.3 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut Mike Frysinger @ 2014-01-05 18:04 ` Sebastian Luther 2014-01-05 19:34 ` Mike Frysinger 2014-01-05 18:23 ` Brian Dolbec 1 sibling, 1 reply; 18+ messages in thread From: Sebastian Luther @ 2014-01-05 18:04 UTC (permalink / raw To: gentoo-portage-dev Am 05.01.2014 16:50, schrieb Mike Frysinger: > This automates the release+test cycle a bit so people don't have to do > it all by hand. > --- > DEVELOPING | 7 ++----- > mkrelease.sh | 15 +++++++++++++-- > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/DEVELOPING b/DEVELOPING > index 7aac81b..b704a50 100644 > --- a/DEVELOPING > +++ b/DEVELOPING > @@ -167,11 +167,8 @@ Releases > First create a git tag for this release: > git tag v2.2.8 > > -Then create the tarball: > - ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 > - > -Unpack the tarball and run tests: > - ./runtests.sh --python-versions=supported > +Then create the tarball and run the tests: > + ./mkrelease.sh --changelog-rev v2.2.7 --tag --runtests 2.2.8 Shouldn't this be: ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 --runtests 2.2.8 ? > Make sure you have all supported python versions installed first > (see PYTHON_SUPPORTED_VERSIONS in runtests.sh). > > diff --git a/mkrelease.sh b/mkrelease.sh > index 50bdb3c..334b4fb 100755 > --- a/mkrelease.sh > +++ b/mkrelease.sh > @@ -8,9 +8,10 @@ BRANCH=${BRANCH:-master} > USE_TAG=false > CHANGELOG_REVISION= > UPLOAD_LOCATION= > +RUNTESTS=false > > usage() { > - echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] <version>" > + echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] [--runtests] <version>" > exit ${1:-0} > } > > @@ -19,7 +20,7 @@ die() { > usage 1 > } > > -ARGS=$(getopt -o htu: --long help,changelog-rev:,tag,upload: \ > +ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload: \ > -n "${0##*/}" -- "$@") > [ $? != 0 ] && die "initialization error" > > @@ -42,6 +43,10 @@ while true; do > -h|--help) > usage > ;; > + --runtests) > + RUNTESTS=true > + shift > + ;; > --) > shift > break > @@ -78,6 +83,12 @@ cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,misc,pym} "${RELEASE_DIR}/" || die "direc > cp "${SOURCE_DIR}/"{DEVELOPING,LICENSE,Makefile,NEWS,README,RELEASE-NOTES,TEST-NOTES} \ > "${RELEASE_DIR}/" || die "file copy failed" > > +if [[ ${RUNTESTS} == "true" ]] ; then > + pushd "${SOURCE_DIR}" >/dev/null > + ./runtests.sh --python-versions=supported || die "tests failed" > + popd >/dev/null > +fi > + > rm -rf "${SOURCE_DIR}" || die "directory cleanup failed" > > echo ">>> Setting portage.VERSION" > ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 18:04 ` Sebastian Luther @ 2014-01-05 19:34 ` Mike Frysinger 2014-01-05 20:33 ` Sebastian Luther 0 siblings, 1 reply; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 19:34 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: Text/Plain, Size: 631 bytes --] On Sunday 05 January 2014 13:04:04 Sebastian Luther wrote: > Am 05.01.2014 16:50, schrieb Mike Frysinger: > > +Then create the tarball and run the tests: > > + ./mkrelease.sh --changelog-rev v2.2.7 --tag --runtests 2.2.8 > > Shouldn't this be: > ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 --runtests 2.2.8 nope. the --tag option doesn't take any arguments. the old mkrelease would silently ignore extra args, but the updated one i pushed will now fail on this. also, please snip any content you're not replying to. makes it harder to scan for responses when there's a lot of untouched content. -mike [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 19:34 ` Mike Frysinger @ 2014-01-05 20:33 ` Sebastian Luther 0 siblings, 0 replies; 18+ messages in thread From: Sebastian Luther @ 2014-01-05 20:33 UTC (permalink / raw To: gentoo-portage-dev Am 05.01.2014 20:34, schrieb Mike Frysinger: > On Sunday 05 January 2014 13:04:04 Sebastian Luther wrote: >> Am 05.01.2014 16:50, schrieb Mike Frysinger: >>> +Then create the tarball and run the tests: + ./mkrelease.sh >>> --changelog-rev v2.2.7 --tag --runtests 2.2.8 >> >> Shouldn't this be: ./mkrelease.sh --changelog-rev v2.2.7 --tag >> 2.2.8 --runtests 2.2.8 > > nope. the --tag option doesn't take any arguments. the old > mkrelease would silently ignore extra args, but the updated one i > pushed will now fail on this. Ok. > > also, please snip any content you're not replying to. makes it > harder to scan for responses when there's a lot of untouched > content. -mike > Ok. ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut Mike Frysinger 2014-01-05 18:04 ` Sebastian Luther @ 2014-01-05 18:23 ` Brian Dolbec 2014-01-05 19:35 ` Mike Frysinger 1 sibling, 1 reply; 18+ messages in thread From: Brian Dolbec @ 2014-01-05 18:23 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: text/plain, Size: 2619 bytes --] On Sun, 2014-01-05 at 10:50 -0500, Mike Frysinger wrote: > This automates the release+test cycle a bit so people don't have to do > it all by hand. > --- > DEVELOPING | 7 ++----- > mkrelease.sh | 15 +++++++++++++-- > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/DEVELOPING b/DEVELOPING > index 7aac81b..b704a50 100644 > --- a/DEVELOPING > +++ b/DEVELOPING > @@ -167,11 +167,8 @@ Releases > First create a git tag for this release: > git tag v2.2.8 > > -Then create the tarball: > - ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 > - > -Unpack the tarball and run tests: > - ./runtests.sh --python-versions=supported > +Then create the tarball and run the tests: > + ./mkrelease.sh --changelog-rev v2.2.7 --tag --runtests 2.2.8 > Make sure you have all supported python versions installed first > (see PYTHON_SUPPORTED_VERSIONS in runtests.sh). > > diff --git a/mkrelease.sh b/mkrelease.sh > index 50bdb3c..334b4fb 100755 > --- a/mkrelease.sh > +++ b/mkrelease.sh > @@ -8,9 +8,10 @@ BRANCH=${BRANCH:-master} > USE_TAG=false > CHANGELOG_REVISION= > UPLOAD_LOCATION= > +RUNTESTS=false > > usage() { > - echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] <version>" > + echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] [--runtests] <version>" > exit ${1:-0} > } > > @@ -19,7 +20,7 @@ die() { > usage 1 > } > > -ARGS=$(getopt -o htu: --long help,changelog-rev:,tag,upload: \ > +ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload: \ > -n "${0##*/}" -- "$@") > [ $? != 0 ] && die "initialization error" > > @@ -42,6 +43,10 @@ while true; do > -h|--help) > usage > ;; > + --runtests) > + RUNTESTS=true > + shift > + ;; > --) > shift > break > @@ -78,6 +83,12 @@ cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,misc,pym} "${RELEASE_DIR}/" || die "direc > cp "${SOURCE_DIR}/"{DEVELOPING,LICENSE,Makefile,NEWS,README,RELEASE-NOTES,TEST-NOTES} \ > "${RELEASE_DIR}/" || die "file copy failed" > > +if [[ ${RUNTESTS} == "true" ]] ; then > + pushd "${SOURCE_DIR}" >/dev/null > + ./runtests.sh --python-versions=supported || die "tests failed" > + popd >/dev/null > +fi > + > rm -rf "${SOURCE_DIR}" || die "directory cleanup failed" > > echo ">>> Setting portage.VERSION" I've added them to my checkout and running it now. If it all works as it should, I'll push them all with the 2.2.8 release. They do not affect portage/emerge, so shouldn't need more testing time. [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 620 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut 2014-01-05 18:23 ` Brian Dolbec @ 2014-01-05 19:35 ` Mike Frysinger 0 siblings, 0 replies; 18+ messages in thread From: Mike Frysinger @ 2014-01-05 19:35 UTC (permalink / raw To: gentoo-portage-dev; +Cc: Brian Dolbec [-- Attachment #1: Type: Text/Plain, Size: 540 bytes --] On Sunday 05 January 2014 13:23:38 Brian Dolbec wrote: > On Sun, 2014-01-05 at 10:50 -0500, Mike Frysinger wrote: > > This automates the release+test cycle a bit so people don't have to do > > it all by hand. > > I've added them to my checkout and running it now. > > If it all works as it should, I'll push them all with the 2.2.8 release. > They do not affect portage/emerge, so shouldn't need more testing time. i've pushed all but this last one now. feel free to push it once you've verified things on your side. -mike [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut Mike Frysinger @ 2014-01-05 17:58 ` Brian Dolbec 2 siblings, 0 replies; 18+ messages in thread From: Brian Dolbec @ 2014-01-05 17:58 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: text/plain, Size: 1751 bytes --] On Sun, 2014-01-05 at 10:50 -0500, Mike Frysinger wrote: > This keeps the list of supported versions in one place so people can do: > ./runtests.sh --python-versions=supported > > No need to hardcode the list of python versions in multiple places. > --- > DEVELOPING | 6 +++--- > runtests.sh | 5 +++++ > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/DEVELOPING b/DEVELOPING > index 5dfd9b7..7aac81b 100644 > --- a/DEVELOPING > +++ b/DEVELOPING > @@ -171,9 +171,9 @@ Then create the tarball: > ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 > > Unpack the tarball and run tests: > - ./runtests.sh > -Make sure you have all supported python versions installed: > - 2.6 2.7 3.2 3.3 > + ./runtests.sh --python-versions=supported > +Make sure you have all supported python versions installed first > +(see PYTHON_SUPPORTED_VERSIONS in runtests.sh). > > Version bump the ebuild and verify it can re-install itself: > emerge portage > diff --git a/runtests.sh b/runtests.sh > index 010a7bf..3006be5 100755 > --- a/runtests.sh > +++ b/runtests.sh > @@ -2,6 +2,8 @@ > # Copyright 2010-2012 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > +# These are the versions we care about. The rest are just "nice to have". > +PYTHON_SUPPORTED_VERSIONS="2.6 2.7 3.2 3.3" > PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0 3.1 3.2 3.3 3.4" > > # has to be run from portage root dir > @@ -44,6 +46,9 @@ while [ $# -gt 0 ] ; do > esac > shift > done > +if [[ ${PYTHON_VERSIONS} == "supported" ]] ; then > + PYTHON_VERSIONS=${PYTHON_SUPPORTED_VERSIONS} > +fi > > set -- "${unused_args[@]}" > I like it :) [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 620 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] [PATCH] document release process 2014-01-05 15:25 ` [gentoo-portage-dev] [PATCH] document release process Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger @ 2014-01-05 17:53 ` Brian Dolbec 1 sibling, 0 replies; 18+ messages in thread From: Brian Dolbec @ 2014-01-05 17:53 UTC (permalink / raw To: gentoo-portage-dev [-- Attachment #1: Type: text/plain, Size: 1331 bytes --] On Sun, 2014-01-05 at 10:25 -0500, Mike Frysinger wrote: > --- > DEVELOPING | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/DEVELOPING b/DEVELOPING > index 5f15e15..5dfd9b7 100644 > --- a/DEVELOPING > +++ b/DEVELOPING > @@ -160,3 +160,28 @@ The NO example just imports a set of functions from the output module. It is > somewhat annoying because the import line needs to be modified when functions > are needed and often unused functions are left in the import line until someone > comes along with a linter to clean up (does not happen often). > + > +Releases > +-------- > + > +First create a git tag for this release: > + git tag v2.2.8 > + > +Then create the tarball: > + ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 > + > +Unpack the tarball and run tests: > + ./runtests.sh > +Make sure you have all supported python versions installed: > + 2.6 2.7 3.2 3.3 > + > +Version bump the ebuild and verify it can re-install itself: > + emerge portage > + emerge portage > + > +Publish the results (no going back now): > + - Push the new git tag > + - Upload the tarball > + - Commit the new ebuild version > + > +Close the bugs blocking the tracker bug for this release. looks good to me. Why not push this now before I make the 2.2.8 release [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 620 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [gentoo-portage-dev] New portage version with latest fixes in git is needed 2014-01-04 14:56 ` Brian Dolbec 2014-01-04 15:03 ` Mike Frysinger @ 2014-01-04 21:53 ` Sebastian Luther 1 sibling, 0 replies; 18+ messages in thread From: Sebastian Luther @ 2014-01-04 21:53 UTC (permalink / raw To: gentoo-portage-dev Am 04.01.2014 15:56, schrieb Brian Dolbec: > On Sat, 2014-01-04 at 15:28 +0100, Pacho Ramos wrote: >> Hello >> >> I think this was pointed some days ago, but would be nice (and >> needed) to get a newer portage version including fixes from git, >> some of them important like: >> https://bugs.gentoo.org/show_bug.cgi?id=490362 >> >> Not sure if I can contribute with something on this, but if you >> thing so, please let me know >> >> Thanks! >> >> > > Yes, I planned to get it out this weekend, if all goes well. > > There are one or two more patches to apply. Then I'll start > packaging it. > I'd say, apply only the really necessary patches (i.e. the python-2.6 compat patch) and commit the remaining patches after the release. > Is everyone else in agreement? > Go for it. Sebastian ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-01-05 20:33 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-01-04 14:28 [gentoo-portage-dev] New portage version with latest fixes in git is needed Pacho Ramos 2014-01-04 14:56 ` Brian Dolbec 2014-01-04 15:03 ` Mike Frysinger 2014-01-04 21:49 ` Sebastian Luther 2014-01-04 22:09 ` Sebastian Luther 2014-01-05 15:25 ` [gentoo-portage-dev] [PATCH] document release process Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Mike Frysinger 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 2/3] runtests: hardfail when a requested version is not found Mike Frysinger 2014-01-05 18:06 ` Brian Dolbec 2014-01-05 15:50 ` [gentoo-portage-dev] [PATCH 3/3] mkrelease: add a --runtests shortcut Mike Frysinger 2014-01-05 18:04 ` Sebastian Luther 2014-01-05 19:34 ` Mike Frysinger 2014-01-05 20:33 ` Sebastian Luther 2014-01-05 18:23 ` Brian Dolbec 2014-01-05 19:35 ` Mike Frysinger 2014-01-05 17:58 ` [gentoo-portage-dev] [PATCH 1/3] runtests: add a "supported" shortcut Brian Dolbec 2014-01-05 17:53 ` [gentoo-portage-dev] [PATCH] document release process Brian Dolbec 2014-01-04 21:53 ` [gentoo-portage-dev] New portage version with latest fixes in git is needed Sebastian Luther
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox