From: <gr...@us...> - 2011-12-16 21:30:22
|
Revision: 7257 http://docutils.svn.sourceforge.net/docutils/?rev=7257&view=rev Author: grubert Date: 2011-12-16 21:30:14 +0000 (Fri, 16 Dec 2011) Log Message: ----------- move old scripts into attic Added Paths: ----------- trunk/sandbox/infrastructure/attic/ trunk/sandbox/infrastructure/attic/dbackport.sh trunk/sandbox/infrastructure/attic/fsfsbackup.sh trunk/sandbox/infrastructure/attic/uploaddocutils.sh Removed Paths: ------------- trunk/sandbox/infrastructure/dbackport.sh trunk/sandbox/infrastructure/fsfsbackup.sh trunk/sandbox/infrastructure/uploaddocutils.sh Copied: trunk/sandbox/infrastructure/attic/dbackport.sh (from rev 7256, trunk/sandbox/infrastructure/dbackport.sh) =================================================================== --- trunk/sandbox/infrastructure/attic/dbackport.sh (rev 0) +++ trunk/sandbox/infrastructure/attic/dbackport.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -0,0 +1,60 @@ +#!/bin/bash + +# Author: Lea Wiemann +# Contact: LeW...@gm... +# Revision: $Revision$ +# Date: $Date$ +# Copyright: This script has been placed in the public domain. + +set -e + +if test -z "$1" -o "$1" == "-h" -o "$1" == "--help"; then + echo Usage: "`basename "$0"` [-c] <revision> [[-c] <revision> ...]" + echo + echo 'Any revision number that is prepended with "-c" is only checked in;' + echo 'no actual merging is done. (Useful for resuming aborted backports,' + echo 'for example after manually resolving conflicts.)' + exit 1 +fi + +while test -n "$1"; do + commit_only= + if test "$1" == "-c"; then + commit_only=1 + if test -z "$2"; then + echo 'Error: Expected revision number after "-c".' + exit 1 + fi + shift + fi + r="$1" + if test ! "$DOCUTILS_MAINT_BRANCH"; then + echo '$DOCUTILS_MAINT_BRANCH must point to the directory of the' + echo 'maintenance branch.' + exit 1 + fi + + cd "$DOCUTILS_MAINT_BRANCH" + if test -z "$commit_only"; then + svn revert . -R + svn up + svn merge -r"$[$r-1]:$r" ../../trunk/docutils . + fi + svn diff + if test "`svn st docutils test *.py -q`"; then + # Some code has changed. + # Python 2.5 is faster and outputs unified diffs for the functional + # tests, so it comes first. + nice python2.5 -u test/alltests.py + nice python2.1 -u test/alltests.py + nice python2.2 -u test/alltests.py + nice python2.3 -u test/alltests.py + nice python2.4 -u test/alltests.py + fi + echo + echo Press enter to commit or Ctrl+C to abort. + read + svn ci -m "--- MERGE: merged r$r to maintenance branch; original log message: +`svn pg svn:log --revprop -r "$r"`" + shift +done Copied: trunk/sandbox/infrastructure/attic/fsfsbackup.sh (from rev 7256, trunk/sandbox/infrastructure/fsfsbackup.sh) =================================================================== --- trunk/sandbox/infrastructure/attic/fsfsbackup.sh (rev 0) +++ trunk/sandbox/infrastructure/attic/fsfsbackup.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -0,0 +1,90 @@ +#!/bin/bash + +# $Id$ +# Author: Lea Wiemann <LeW...@gm...> +# Copyright: This file has been placed in the public domain. + +# Options: +# +# -f Do not print feedback. + +set -e + +trap "echo; echo Exiting with error.; trap - 0; exit 1" 0 1 2 3 15 + +test "$1" == -f && printfeedback= || printfeedback=1 + +function feedback() { + test "$printfeedback" && echo "$@" || true +} + +function do_backup() { + # If any of the tests fails, the script terminates silently. + feedback "--- Backing up svn+ssh://$HOST$REMOTEDIR ---" + feedback "Checking that all necessary variables are set." + test -n "$BACKUPDIR" + test -n "$HOST" + test -n "$REMOTEDIR" + if test ! -d "$BACKUPDIR"; then + feedback "Creating backup directory $BACKUPDIR." + mkdir --parents --verbose "$BACKUPDIR" + fi + if test ! -f "$BACKUPDIR/db/fs-type"; then + feedback + echo "$BACKUPDIR/db/fs-type not found." + echo "Please fetch the first copy of the repository database yourself." + echo "I only assist in doing incremental backups of repository databases." + exit 1 + fi + feedback "Checking that repository format is FSFS." + test "`cat "$BACKUPDIR/db/fs-type"`" == fsfs + feedback "Changing to database directory $BACKUPDIR/db." + cd "$BACKUPDIR/db" + feedback "Getting local current revision number." + LOCALREVNUM="`cat current | sed 's/ .*//'`" + feedback "Checking that current.new doesn't exist." + if test -f current.new; then + feedback + echo "Make sure that no other instance of this script" + echo "is running and delete the following file:" + echo "$BACKUPDIR/db/current.new" + exit 2 + fi + feedback "Getting remote 'current' file." + ssh "$HOST" "cat '$REMOTEDIR/db/current'" > current.new + feedback "Getting remote current revision number." + REMOTEREVNUM="`cat current.new | sed 's/ .*//'`" + feedback "Checking that we got a response from the server." + test -n "$REMOTEREVNUM" + if ! test "$LOCALREVNUM" -le "$REMOTEREVNUM"; then + feedback + echo "ERROR: Local revision number ($LOCALREVNUM) greater" + echo " than remote revision number ($REMOTEREVNUM)." + echo "Wrong backup directory or changed repository?" + exit 2 + fi + if test "$LOCALREVNUM" -eq "$REMOTEREVNUM"; then + feedback "No backup needed; at revision $LOCALREVNUM." + feedback "Removing 'current.new'." + rm current.new + else + LOCALREVNUM="$[$LOCALREVNUM+1]" + feedback "Backing up from revision $LOCALREVNUM to revision $REMOTEREVNUM." + test "$printfeedback" && verbose=-v || verbose= + ssh "$HOST" " + set -e; + cd $REMOTEDIR/db/; + nice -n 10 tar cf - \`seq -f revs/%g $LOCALREVNUM $REMOTEREVNUM\` \`seq -f revprops/%g $LOCALREVNUM $REMOTEREVNUM\` | nice -n 10 bzip2 -c" \ + | tar $verbose -xjf - + feedback "Renaming 'current.new' to 'current'." + mv current.new current + fi + feedback "Done." + feedback "" +} + +feedback 'Reading ~/.fsfsbackup.' +feedback '' +source ~/.fsfsbackup +feedback 'Finished.' +trap - 0 1 2 3 15 Copied: trunk/sandbox/infrastructure/attic/uploaddocutils.sh (from rev 7256, trunk/sandbox/infrastructure/uploaddocutils.sh) =================================================================== --- trunk/sandbox/infrastructure/attic/uploaddocutils.sh (rev 0) +++ trunk/sandbox/infrastructure/attic/uploaddocutils.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -0,0 +1,38 @@ +#!/bin/sh + +# Author: Lea Wiemann +# Contact: LeW...@gm... +# Revision: $Revision$ +# Date: $Date$ +# Copyright: This script has been placed in the public domain. + +set -e + +date="`date --utc --iso-8601`" + +if test -z "$1" -o "$1" = -h -o "$1" = --help; then + uploaddocutils="`basename "$0"`" + echo This script uploads files to http://docutils.sf.net/tmp/ using scp. + echo It inserts the current date in the file names and prints the + echo resulting URLs. + echo + echo Usage: "$uploaddocutils" files ... + echo + echo For example, \""$uploaddocutils" test.tar.gz\" will upload + echo test.tar.gz to "<http://docutils.sf.net/tmp/test-$date.tar.gz>". + exit 1 +fi + +urllist= +while test -n "$1"; do + localfile="$1" + remotefile="`basename $1`" + # Add date in front of first period or at the end of the file name + # if there is no period. + remotefile="`echo "$remotefile" | sed 's/\(\.\|$\)/-'"$date"'\1/'`" + scp "$localfile" "shell.sourceforge.net:/home/groups/d/do/docutils/htdocs/tmp/$remotefile" + urllist="$urllist +http://docutils.sf.net/tmp/$remotefile" + shift +done +echo "$urllist" Deleted: trunk/sandbox/infrastructure/dbackport.sh =================================================================== --- trunk/sandbox/infrastructure/dbackport.sh 2011-12-14 23:53:38 UTC (rev 7256) +++ trunk/sandbox/infrastructure/dbackport.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -1,60 +0,0 @@ -#!/bin/bash - -# Author: Lea Wiemann -# Contact: LeW...@gm... -# Revision: $Revision$ -# Date: $Date$ -# Copyright: This script has been placed in the public domain. - -set -e - -if test -z "$1" -o "$1" == "-h" -o "$1" == "--help"; then - echo Usage: "`basename "$0"` [-c] <revision> [[-c] <revision> ...]" - echo - echo 'Any revision number that is prepended with "-c" is only checked in;' - echo 'no actual merging is done. (Useful for resuming aborted backports,' - echo 'for example after manually resolving conflicts.)' - exit 1 -fi - -while test -n "$1"; do - commit_only= - if test "$1" == "-c"; then - commit_only=1 - if test -z "$2"; then - echo 'Error: Expected revision number after "-c".' - exit 1 - fi - shift - fi - r="$1" - if test ! "$DOCUTILS_MAINT_BRANCH"; then - echo '$DOCUTILS_MAINT_BRANCH must point to the directory of the' - echo 'maintenance branch.' - exit 1 - fi - - cd "$DOCUTILS_MAINT_BRANCH" - if test -z "$commit_only"; then - svn revert . -R - svn up - svn merge -r"$[$r-1]:$r" ../../trunk/docutils . - fi - svn diff - if test "`svn st docutils test *.py -q`"; then - # Some code has changed. - # Python 2.5 is faster and outputs unified diffs for the functional - # tests, so it comes first. - nice python2.5 -u test/alltests.py - nice python2.1 -u test/alltests.py - nice python2.2 -u test/alltests.py - nice python2.3 -u test/alltests.py - nice python2.4 -u test/alltests.py - fi - echo - echo Press enter to commit or Ctrl+C to abort. - read - svn ci -m "--- MERGE: merged r$r to maintenance branch; original log message: -`svn pg svn:log --revprop -r "$r"`" - shift -done Deleted: trunk/sandbox/infrastructure/fsfsbackup.sh =================================================================== --- trunk/sandbox/infrastructure/fsfsbackup.sh 2011-12-14 23:53:38 UTC (rev 7256) +++ trunk/sandbox/infrastructure/fsfsbackup.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -1,90 +0,0 @@ -#!/bin/bash - -# $Id$ -# Author: Lea Wiemann <LeW...@gm...> -# Copyright: This file has been placed in the public domain. - -# Options: -# -# -f Do not print feedback. - -set -e - -trap "echo; echo Exiting with error.; trap - 0; exit 1" 0 1 2 3 15 - -test "$1" == -f && printfeedback= || printfeedback=1 - -function feedback() { - test "$printfeedback" && echo "$@" || true -} - -function do_backup() { - # If any of the tests fails, the script terminates silently. - feedback "--- Backing up svn+ssh://$HOST$REMOTEDIR ---" - feedback "Checking that all necessary variables are set." - test -n "$BACKUPDIR" - test -n "$HOST" - test -n "$REMOTEDIR" - if test ! -d "$BACKUPDIR"; then - feedback "Creating backup directory $BACKUPDIR." - mkdir --parents --verbose "$BACKUPDIR" - fi - if test ! -f "$BACKUPDIR/db/fs-type"; then - feedback - echo "$BACKUPDIR/db/fs-type not found." - echo "Please fetch the first copy of the repository database yourself." - echo "I only assist in doing incremental backups of repository databases." - exit 1 - fi - feedback "Checking that repository format is FSFS." - test "`cat "$BACKUPDIR/db/fs-type"`" == fsfs - feedback "Changing to database directory $BACKUPDIR/db." - cd "$BACKUPDIR/db" - feedback "Getting local current revision number." - LOCALREVNUM="`cat current | sed 's/ .*//'`" - feedback "Checking that current.new doesn't exist." - if test -f current.new; then - feedback - echo "Make sure that no other instance of this script" - echo "is running and delete the following file:" - echo "$BACKUPDIR/db/current.new" - exit 2 - fi - feedback "Getting remote 'current' file." - ssh "$HOST" "cat '$REMOTEDIR/db/current'" > current.new - feedback "Getting remote current revision number." - REMOTEREVNUM="`cat current.new | sed 's/ .*//'`" - feedback "Checking that we got a response from the server." - test -n "$REMOTEREVNUM" - if ! test "$LOCALREVNUM" -le "$REMOTEREVNUM"; then - feedback - echo "ERROR: Local revision number ($LOCALREVNUM) greater" - echo " than remote revision number ($REMOTEREVNUM)." - echo "Wrong backup directory or changed repository?" - exit 2 - fi - if test "$LOCALREVNUM" -eq "$REMOTEREVNUM"; then - feedback "No backup needed; at revision $LOCALREVNUM." - feedback "Removing 'current.new'." - rm current.new - else - LOCALREVNUM="$[$LOCALREVNUM+1]" - feedback "Backing up from revision $LOCALREVNUM to revision $REMOTEREVNUM." - test "$printfeedback" && verbose=-v || verbose= - ssh "$HOST" " - set -e; - cd $REMOTEDIR/db/; - nice -n 10 tar cf - \`seq -f revs/%g $LOCALREVNUM $REMOTEREVNUM\` \`seq -f revprops/%g $LOCALREVNUM $REMOTEREVNUM\` | nice -n 10 bzip2 -c" \ - | tar $verbose -xjf - - feedback "Renaming 'current.new' to 'current'." - mv current.new current - fi - feedback "Done." - feedback "" -} - -feedback 'Reading ~/.fsfsbackup.' -feedback '' -source ~/.fsfsbackup -feedback 'Finished.' -trap - 0 1 2 3 15 Deleted: trunk/sandbox/infrastructure/uploaddocutils.sh =================================================================== --- trunk/sandbox/infrastructure/uploaddocutils.sh 2011-12-14 23:53:38 UTC (rev 7256) +++ trunk/sandbox/infrastructure/uploaddocutils.sh 2011-12-16 21:30:14 UTC (rev 7257) @@ -1,38 +0,0 @@ -#!/bin/sh - -# Author: Lea Wiemann -# Contact: LeW...@gm... -# Revision: $Revision$ -# Date: $Date$ -# Copyright: This script has been placed in the public domain. - -set -e - -date="`date --utc --iso-8601`" - -if test -z "$1" -o "$1" = -h -o "$1" = --help; then - uploaddocutils="`basename "$0"`" - echo This script uploads files to http://docutils.sf.net/tmp/ using scp. - echo It inserts the current date in the file names and prints the - echo resulting URLs. - echo - echo Usage: "$uploaddocutils" files ... - echo - echo For example, \""$uploaddocutils" test.tar.gz\" will upload - echo test.tar.gz to "<http://docutils.sf.net/tmp/test-$date.tar.gz>". - exit 1 -fi - -urllist= -while test -n "$1"; do - localfile="$1" - remotefile="`basename $1`" - # Add date in front of first period or at the end of the file name - # if there is no period. - remotefile="`echo "$remotefile" | sed 's/\(\.\|$\)/-'"$date"'\1/'`" - scp "$localfile" "shell.sourceforge.net:/home/groups/d/do/docutils/htdocs/tmp/$remotefile" - urllist="$urllist -http://docutils.sf.net/tmp/$remotefile" - shift -done -echo "$urllist" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2011-12-27 20:24:49
|
Revision: 7280 http://docutils.svn.sourceforge.net/docutils/?rev=7280&view=rev Author: grubert Date: 2011-12-27 20:24:42 +0000 (Tue, 27 Dec 2011) Log Message: ----------- move docutils-update into attic (prepurge) Modified Paths: -------------- trunk/sandbox/infrastructure/README.txt Added Paths: ----------- trunk/sandbox/infrastructure/attic/docutils-update.berlios Removed Paths: ------------- trunk/sandbox/infrastructure/docutils-update Modified: trunk/sandbox/infrastructure/README.txt =================================================================== --- trunk/sandbox/infrastructure/README.txt 2011-12-25 23:14:25 UTC (rev 7279) +++ trunk/sandbox/infrastructure/README.txt 2011-12-27 20:24:42 UTC (rev 7280) @@ -39,15 +39,6 @@ :`<htmlfiles.lst>`_: The list of files for ``update-htmlfiles``. -used on and with berlios - -:`<docutils-update>`_: The script that updates the `web site`_. - Executed on berlios, by user wiemann. - - Attention: The cron job is executed, but the script is - doing nothing, because of the way to access sourceforge - changed. - and are these used by anyone. :`<dbackport.sh>`_: Back-port changes from the trunk to the Copied: trunk/sandbox/infrastructure/attic/docutils-update.berlios (from rev 7279, trunk/sandbox/infrastructure/docutils-update) =================================================================== --- trunk/sandbox/infrastructure/attic/docutils-update.berlios (rev 0) +++ trunk/sandbox/infrastructure/attic/docutils-update.berlios 2011-12-27 20:24:42 UTC (rev 7280) @@ -0,0 +1,325 @@ +#! /bin/bash +# $Id$ +# +# ATTENTION +# --------- +# This script is obsolete:: + +echo "cron job is replaced by local updating (see doctils-update.local)" +exit + +# Kept for reference: + +# This script is installed as a cron job to automatically update the +# Docutils web site whenever the SVN files change. Any .html document +# with a corresponding .txt file is regenerated whenever the .txt +# changes. +# +# Options: +# -f Do not give feedback. +# -t Run the script in trace mode ("set -o xtrace"). +# -u Regenerate .html unconditionally. +# -v Run verbosely. +# +# Prerequisites: +# +# - Checked out trunk at $snapshotdir. +# - Checked out main tree at $lib. + +# exit on error +set -e + +# make all newly created files group writeable +umask 002 + +basedir=/home/groups/docutils/htdocs +project=docutils +# $auxdir is non-public. +auxdir=$basedir/aux +# $htdocsdest is the destination for htdocs and will be moved to +# another server later; so we keep it non-public (under $auxdir). +htdocsdest=$auxdir/htdocs +# Where to create the snapshots (non-public). +snapshotdir=$auxdir/snapshots +# Where to publish the snapshots (public). +snapshotdest=/home/groups/ftp/pub/docutils +bindir=$auxdir/bin +htdocs_patchfile=$auxdir/htdocs.patch +htdocs_tarball=$auxdir/htdocs.tar +htdocs_new_tarball=$auxdir/htdocs.new.tar +# htdocs directory on SF.net +remoteproject=/home/groups/d/do/docutils +remotehtdocs=$remoteproject/htdocs +pylib=$auxdir/lib/python +lib=$pylib/$project +# Lock directory. +lockdir=$auxdir/lock +# SSH stuff. +sshdir=$auxdir/.ssh +sshhost=doc...@sh... +sshcommand="ssh -i $lockdir/id_dsa + -o UserKnownHostsFile=$sshdir/known_hosts $sshhost" +# Project base URL (for sitemap) without trailing slash. +baseurl="http://docutils.sourceforge.net" + +export PYTHONPATH=$pylib:$lib:$lib/extras +export PATH=$lib/tools:$PATH + +trace=0 +unconditional=0 +verbose=0 +feedback=1 + +while getopts ftuv opt +do + case $opt in + f) feedback=;; + t) trace=1;; + u) unconditional=1;; + v) verbose=1;; + \?) exit 2;; + esac +done +shift `expr $OPTIND - 1` + +test $feedback && echo 'Starting docutils-update run...' || true + +if [ $trace -eq 1 -o $verbose -eq 1 ] ; then + set -o xtrace +fi + +# Acquire lock. +if ! mkdir $lockdir; then + echo + echo Could not create lock directory at + echo $lockdir + echo + echo Please ensure no other user is running this script + echo and delete the directory. + exit 1 +fi +# Always clean up on exit. +trap "rm -rf $lockdir; trap - 0; exit 1" 0 1 2 3 15 +# Make sure the lock directory is deletable (i.e. rwx) by other group +# members (in case this script crashes after copying files into the +# directory) and un-readable by world (because we'll be storing the +# key in it). +chmod 0770 $lockdir + + +# update library area +cd $lib +svn up --quiet + +# -------------------- Snapshots: -------------------- + +# gather the materials +cd $snapshotdir +svn -q revert $project/$project/__init__.py +haschanges="`svn up docutils sandbox web | grep -v '^At revision '; true`" + +# update __version_details__ string +version_details="snapshot `date --utc --iso`, r`svn info docutils | grep ^Revision: | sed 's/^Revision: //'`" +(echo ",s/^__version_details__ = .*\$/__version_details__ = '$version_details'/"; + echo wq) | ed $project/$project/__init__.py 2> /dev/null + +# Ensure proper directory permissions are set so that the files can be +# modified by several users. Changing permissions of files is +# probably not necessary because files can be deleted and re-created. +# Do not change permissions of aux directory to keep it non-public +# (but change permissions for all subdirectories). +#find $basedir -type f -print0 | xargs -0 chmod ug+rw 2> /dev/null || true +find $basedir -name aux -o -type d -print0 | xargs -0 chmod ug+rwxs 2> /dev/null || true + +# create the snapshots +exclude='--exclude=.svn' +tar -cz $exclude -f $project-snapshot.tgz $project +tar -cz $exclude -f $project-sandbox-snapshot.tgz sandbox +tar -cz $exclude -f $project-web-snapshot.tgz web +( cd sandbox/gschwant ; + tar -cz $exclude -f ../../docfactory-snapshot.tgz docfactory ) + +# plant the snapshots +mv -f *snapshot.tgz $snapshotdest + +# revert and touch (to avoid updating the web site only because of the +# changed timestamp) +svn -q revert $project/$project/__init__.py +touch $project/$project/__init__.py --date \ + "`svn info $project/$project/__init__.py | \ + grep 'Last Changed Date:' | sed 's/[^:]*: //'`" + +# -------------------- htdocs: -------------------- + +cd $snapshotdir + +function copy_to_htdocsdest() { + find "$@" -type d -name .svn -prune -o \( -type f -o -type l \) -print0 | \ + xargs -0 cp --no-dereference --update --parents \ + --target-directory=$htdocsdest +} + +# update htdocs +copy_to_htdocsdest sandbox +(cd $project; copy_to_htdocsdest *) +(cd web; copy_to_htdocsdest * .[^.]*) + +# update HTML docs +cd $htdocsdest/tools + +if [ $trace -eq 0 ] ; then + set +o xtrace +fi + +for makefile in `find .. -name Makefile.docutils-update` ; do + dir=`dirname $makefile` + ( cd $dir ; make -f Makefile.docutils-update -s ) +done + +for htmlfile in `find .. -name '*.html'` ; do + dir=`dirname $htmlfile` + base=`basename $htmlfile .html` + txtfile=$dir/$base.txt + if [ -e $txtfile ] ; then + if [ $unconditional -eq 1 -o $txtfile -nt $htmlfile ] ; then + if [ "${base:0:4}" == "pep-" ] ; then + test $feedback && echo "$txtfile (PEP)" || true + python $lib/tools/rstpep2html.py --config=$dir/docutils.conf $txtfile $htmlfile + haschanges=1 + else + test $feedback && echo $txtfile || true + python $lib/tools/rst2html.py --config=$dir/docutils.conf $txtfile $htmlfile + haschanges=1 + fi + fi + fi +done + +if [ $trace -eq 1 -o $verbose -eq 1 ] ; then + set -o xtrace +fi + +# -------------------- XML sitemap for search engines: -------------------- + +cd $htdocsdest + +# Update the sitemap only if something has changed because it takes +# very much CPU time. +if test -n "$haschanges"; then + ( + echo '<?xml version="1.0" encoding="UTF-8"?>' + echo '<urlset xmlns="http://www.google.com/schemas/sitemap/0.84">' + if [ $trace -eq 0 ] ; then + set +o xtrace + fi + find . -name '.[^.]*' -prune -o -type d -printf '%p/\n' \ + -o \( -type f -o -type l \) -print | \ + while read i; do + # i is the file name. + if test "$i" == ./; then + # Homepage. + i=index.html + url="$baseurl/" + elif test "$i" == ./sitemap -o "${i: -1}" == / -a -f "${i}index.html"; then + # This is a directory and it has an index.html, so we + # don't need to include it. + continue + else + url="$baseurl${i:1}" + url="${url// /%20}" + fi + lastmod="`date --iso-8601=seconds -u -r "$i"`" + # Google wants a colon in front of the last two digits. + lastmod="${lastmod::22}:00" + if test "${i: -5}" == .html; then + # HTML files (including the home page) have highest priority. + priority=1.0 + elif test "${i: -4}" == .txt; then + # Text files have medium priority. + priority=0.5 + else + # Everything else (source files etc.) has low priority. + priority=0.2 + fi + echo "<url><loc>$url</loc><lastmod>$lastmod</lastmod><priority>$priority</priority></url>" + done + if [ $trace -eq 1 -o $verbose -eq 1 ] ; then + set -o xtrace + fi + echo '</urlset>' + ) > sitemap + # sitemap is compressed on the remote site for smaller patch sizes. +fi + +# -------------------- Push changes to remote server. -------------------- + +# SSH doesn't want to read id_dsa files which don't have 0600 +# permissions. This is getting into our way here, but we work around +# this by copying id_dsa to $lockdir/id_dsa and setting the +# permissions of the resulting id_dsa file to 0600. + +# Copy the key. +cp $sshdir/id_dsa $lockdir/id_dsa +# SSH wants this. +chmod 0600 $lockdir/id_dsa + +rm -f $htdocs_patchfile +cd $htdocsdest +# try to transfer with rsync +rsync -e "$sshcommand" -r ./ web.sourceforge.net:$remotehtdocs + +# Create new tarball. +tar cf $htdocs_new_tarball . + +# If there is no old tarball, we have to transmit the whole tarball. +if test ! -f $htdocs_tarball; then + test $feedback && echo Transmitting entire tarball. || true + gzip -c $htdocs_new_tarball | $sshcommand \ + " + set -e + umask 002 + cd $remoteproject + gunzip -c > htdocs.tar + cd $remotehtdocs + tar xmf $remoteproject/htdocs.tar + gzip -f sitemap + " +# If the current and the new tarball differ, transmit patch file. +elif ! diff -q $htdocs_tarball $htdocs_new_tarball > /dev/null; then + # Create patch. + $bindir/bsdiff $htdocs_tarball $htdocs_new_tarball $htdocs_patchfile + test $feedback && echo Patch size: `du -h $htdocs_patchfile | sed 's/\t.*//'` || true + # Delete current tarball. If something goes wrong with uploading + # and applying the patch file, docutils-update will notice that + # the tarball isn't present at the next run and transfer the whole + # tarball, because we're left in an undefined state (the servers + # are out of sync). + rm -f $htdocs_tarball + # Upload patch file. + $sshcommand \ + " + set -e + umask 002 + cd $remoteproject + cat > htdocs.patch + ~/bin/bspatch htdocs.tar htdocs.new.tar htdocs.patch + cd $remotehtdocs + tar xmf $remoteproject/htdocs.new.tar + gzip -f sitemap + cd $remoteproject + mv htdocs.new.tar htdocs.tar + rm -f htdocs.patch + " \ + < $htdocs_patchfile +fi +mv $htdocs_new_tarball $htdocs_tarball + +# Tidy up. +rm -f $htdocs_patchfile +trap - 0 1 2 3 15 +rm -rf $lockdir +test $feedback && echo '...docutils-update done.' || true + +# Local Variables: +# indent-tabs-mode: nil +# End: Deleted: trunk/sandbox/infrastructure/docutils-update =================================================================== --- trunk/sandbox/infrastructure/docutils-update 2011-12-25 23:14:25 UTC (rev 7279) +++ trunk/sandbox/infrastructure/docutils-update 2011-12-27 20:24:42 UTC (rev 7280) @@ -1,325 +0,0 @@ -#! /bin/bash -# $Id$ -# -# ATTENTION -# --------- -# This script is obsolete:: - -echo "cron job is replaced by local updating (see doctils-update.local)" -exit - -# Kept for reference: - -# This script is installed as a cron job to automatically update the -# Docutils web site whenever the SVN files change. Any .html document -# with a corresponding .txt file is regenerated whenever the .txt -# changes. -# -# Options: -# -f Do not give feedback. -# -t Run the script in trace mode ("set -o xtrace"). -# -u Regenerate .html unconditionally. -# -v Run verbosely. -# -# Prerequisites: -# -# - Checked out trunk at $snapshotdir. -# - Checked out main tree at $lib. - -# exit on error -set -e - -# make all newly created files group writeable -umask 002 - -basedir=/home/groups/docutils/htdocs -project=docutils -# $auxdir is non-public. -auxdir=$basedir/aux -# $htdocsdest is the destination for htdocs and will be moved to -# another server later; so we keep it non-public (under $auxdir). -htdocsdest=$auxdir/htdocs -# Where to create the snapshots (non-public). -snapshotdir=$auxdir/snapshots -# Where to publish the snapshots (public). -snapshotdest=/home/groups/ftp/pub/docutils -bindir=$auxdir/bin -htdocs_patchfile=$auxdir/htdocs.patch -htdocs_tarball=$auxdir/htdocs.tar -htdocs_new_tarball=$auxdir/htdocs.new.tar -# htdocs directory on SF.net -remoteproject=/home/groups/d/do/docutils -remotehtdocs=$remoteproject/htdocs -pylib=$auxdir/lib/python -lib=$pylib/$project -# Lock directory. -lockdir=$auxdir/lock -# SSH stuff. -sshdir=$auxdir/.ssh -sshhost=doc...@sh... -sshcommand="ssh -i $lockdir/id_dsa - -o UserKnownHostsFile=$sshdir/known_hosts $sshhost" -# Project base URL (for sitemap) without trailing slash. -baseurl="http://docutils.sourceforge.net" - -export PYTHONPATH=$pylib:$lib:$lib/extras -export PATH=$lib/tools:$PATH - -trace=0 -unconditional=0 -verbose=0 -feedback=1 - -while getopts ftuv opt -do - case $opt in - f) feedback=;; - t) trace=1;; - u) unconditional=1;; - v) verbose=1;; - \?) exit 2;; - esac -done -shift `expr $OPTIND - 1` - -test $feedback && echo 'Starting docutils-update run...' || true - -if [ $trace -eq 1 -o $verbose -eq 1 ] ; then - set -o xtrace -fi - -# Acquire lock. -if ! mkdir $lockdir; then - echo - echo Could not create lock directory at - echo $lockdir - echo - echo Please ensure no other user is running this script - echo and delete the directory. - exit 1 -fi -# Always clean up on exit. -trap "rm -rf $lockdir; trap - 0; exit 1" 0 1 2 3 15 -# Make sure the lock directory is deletable (i.e. rwx) by other group -# members (in case this script crashes after copying files into the -# directory) and un-readable by world (because we'll be storing the -# key in it). -chmod 0770 $lockdir - - -# update library area -cd $lib -svn up --quiet - -# -------------------- Snapshots: -------------------- - -# gather the materials -cd $snapshotdir -svn -q revert $project/$project/__init__.py -haschanges="`svn up docutils sandbox web | grep -v '^At revision '; true`" - -# update __version_details__ string -version_details="snapshot `date --utc --iso`, r`svn info docutils | grep ^Revision: | sed 's/^Revision: //'`" -(echo ",s/^__version_details__ = .*\$/__version_details__ = '$version_details'/"; - echo wq) | ed $project/$project/__init__.py 2> /dev/null - -# Ensure proper directory permissions are set so that the files can be -# modified by several users. Changing permissions of files is -# probably not necessary because files can be deleted and re-created. -# Do not change permissions of aux directory to keep it non-public -# (but change permissions for all subdirectories). -#find $basedir -type f -print0 | xargs -0 chmod ug+rw 2> /dev/null || true -find $basedir -name aux -o -type d -print0 | xargs -0 chmod ug+rwxs 2> /dev/null || true - -# create the snapshots -exclude='--exclude=.svn' -tar -cz $exclude -f $project-snapshot.tgz $project -tar -cz $exclude -f $project-sandbox-snapshot.tgz sandbox -tar -cz $exclude -f $project-web-snapshot.tgz web -( cd sandbox/gschwant ; - tar -cz $exclude -f ../../docfactory-snapshot.tgz docfactory ) - -# plant the snapshots -mv -f *snapshot.tgz $snapshotdest - -# revert and touch (to avoid updating the web site only because of the -# changed timestamp) -svn -q revert $project/$project/__init__.py -touch $project/$project/__init__.py --date \ - "`svn info $project/$project/__init__.py | \ - grep 'Last Changed Date:' | sed 's/[^:]*: //'`" - -# -------------------- htdocs: -------------------- - -cd $snapshotdir - -function copy_to_htdocsdest() { - find "$@" -type d -name .svn -prune -o \( -type f -o -type l \) -print0 | \ - xargs -0 cp --no-dereference --update --parents \ - --target-directory=$htdocsdest -} - -# update htdocs -copy_to_htdocsdest sandbox -(cd $project; copy_to_htdocsdest *) -(cd web; copy_to_htdocsdest * .[^.]*) - -# update HTML docs -cd $htdocsdest/tools - -if [ $trace -eq 0 ] ; then - set +o xtrace -fi - -for makefile in `find .. -name Makefile.docutils-update` ; do - dir=`dirname $makefile` - ( cd $dir ; make -f Makefile.docutils-update -s ) -done - -for htmlfile in `find .. -name '*.html'` ; do - dir=`dirname $htmlfile` - base=`basename $htmlfile .html` - txtfile=$dir/$base.txt - if [ -e $txtfile ] ; then - if [ $unconditional -eq 1 -o $txtfile -nt $htmlfile ] ; then - if [ "${base:0:4}" == "pep-" ] ; then - test $feedback && echo "$txtfile (PEP)" || true - python $lib/tools/rstpep2html.py --config=$dir/docutils.conf $txtfile $htmlfile - haschanges=1 - else - test $feedback && echo $txtfile || true - python $lib/tools/rst2html.py --config=$dir/docutils.conf $txtfile $htmlfile - haschanges=1 - fi - fi - fi -done - -if [ $trace -eq 1 -o $verbose -eq 1 ] ; then - set -o xtrace -fi - -# -------------------- XML sitemap for search engines: -------------------- - -cd $htdocsdest - -# Update the sitemap only if something has changed because it takes -# very much CPU time. -if test -n "$haschanges"; then - ( - echo '<?xml version="1.0" encoding="UTF-8"?>' - echo '<urlset xmlns="http://www.google.com/schemas/sitemap/0.84">' - if [ $trace -eq 0 ] ; then - set +o xtrace - fi - find . -name '.[^.]*' -prune -o -type d -printf '%p/\n' \ - -o \( -type f -o -type l \) -print | \ - while read i; do - # i is the file name. - if test "$i" == ./; then - # Homepage. - i=index.html - url="$baseurl/" - elif test "$i" == ./sitemap -o "${i: -1}" == / -a -f "${i}index.html"; then - # This is a directory and it has an index.html, so we - # don't need to include it. - continue - else - url="$baseurl${i:1}" - url="${url// /%20}" - fi - lastmod="`date --iso-8601=seconds -u -r "$i"`" - # Google wants a colon in front of the last two digits. - lastmod="${lastmod::22}:00" - if test "${i: -5}" == .html; then - # HTML files (including the home page) have highest priority. - priority=1.0 - elif test "${i: -4}" == .txt; then - # Text files have medium priority. - priority=0.5 - else - # Everything else (source files etc.) has low priority. - priority=0.2 - fi - echo "<url><loc>$url</loc><lastmod>$lastmod</lastmod><priority>$priority</priority></url>" - done - if [ $trace -eq 1 -o $verbose -eq 1 ] ; then - set -o xtrace - fi - echo '</urlset>' - ) > sitemap - # sitemap is compressed on the remote site for smaller patch sizes. -fi - -# -------------------- Push changes to remote server. -------------------- - -# SSH doesn't want to read id_dsa files which don't have 0600 -# permissions. This is getting into our way here, but we work around -# this by copying id_dsa to $lockdir/id_dsa and setting the -# permissions of the resulting id_dsa file to 0600. - -# Copy the key. -cp $sshdir/id_dsa $lockdir/id_dsa -# SSH wants this. -chmod 0600 $lockdir/id_dsa - -rm -f $htdocs_patchfile -cd $htdocsdest -# try to transfer with rsync -rsync -e "$sshcommand" -r ./ web.sourceforge.net:$remotehtdocs - -# Create new tarball. -tar cf $htdocs_new_tarball . - -# If there is no old tarball, we have to transmit the whole tarball. -if test ! -f $htdocs_tarball; then - test $feedback && echo Transmitting entire tarball. || true - gzip -c $htdocs_new_tarball | $sshcommand \ - " - set -e - umask 002 - cd $remoteproject - gunzip -c > htdocs.tar - cd $remotehtdocs - tar xmf $remoteproject/htdocs.tar - gzip -f sitemap - " -# If the current and the new tarball differ, transmit patch file. -elif ! diff -q $htdocs_tarball $htdocs_new_tarball > /dev/null; then - # Create patch. - $bindir/bsdiff $htdocs_tarball $htdocs_new_tarball $htdocs_patchfile - test $feedback && echo Patch size: `du -h $htdocs_patchfile | sed 's/\t.*//'` || true - # Delete current tarball. If something goes wrong with uploading - # and applying the patch file, docutils-update will notice that - # the tarball isn't present at the next run and transfer the whole - # tarball, because we're left in an undefined state (the servers - # are out of sync). - rm -f $htdocs_tarball - # Upload patch file. - $sshcommand \ - " - set -e - umask 002 - cd $remoteproject - cat > htdocs.patch - ~/bin/bspatch htdocs.tar htdocs.new.tar htdocs.patch - cd $remotehtdocs - tar xmf $remoteproject/htdocs.new.tar - gzip -f sitemap - cd $remoteproject - mv htdocs.new.tar htdocs.tar - rm -f htdocs.patch - " \ - < $htdocs_patchfile -fi -mv $htdocs_new_tarball $htdocs_tarball - -# Tidy up. -rm -f $htdocs_patchfile -trap - 0 1 2 3 15 -rm -rf $lockdir -test $feedback && echo '...docutils-update done.' || true - -# Local Variables: -# indent-tabs-mode: nil -# End: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2011-12-27 21:13:56
|
Revision: 7282 http://docutils.svn.sourceforge.net/docutils/?rev=7282&view=rev Author: grubert Date: 2011-12-27 21:13:50 +0000 (Tue, 27 Dec 2011) Log Message: ----------- use htmlfiles.lst in docutils-update.local Modified Paths: -------------- trunk/sandbox/infrastructure/docutils-update.local Removed Paths: ------------- trunk/sandbox/infrastructure/update-htmlfiles Modified: trunk/sandbox/infrastructure/docutils-update.local =================================================================== --- trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 21:05:27 UTC (rev 7281) +++ trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 21:13:50 UTC (rev 7282) @@ -55,6 +55,7 @@ # URL for SVN project checkout: svnurl=https://docutils.svn.sourceforge.net/svnroot/docutils/trunk +htmlfilelist=`pwd`/htmlfiles.lst basedir=`pwd`/update-dir if [ ! -e $basedir ] ; then test -d $basedir || mkdir $basedir @@ -176,11 +177,27 @@ set +o xtrace fi +# 1. local Makefiles for makefile in `find .. -name Makefile.docutils-update` ; do dir=`dirname $makefile` ( cd $dir ; make -f Makefile.docutils-update -s ) done +cd $htdocsdest + +# 2. generate empty and old html files to force generation +while read -r htmlfile ; do + if [ ! -d `dirname $htmlfile` ] ; then + echo "Old htmlfile entry: $htmlfile" + elif [ ! -e $htmlfile ] ; then + echo "T: $htmlfile" + touch -t 200001010101 $htmlfile + fi +done < $htmlfilelist + +# 3. re/generate html from txt +cd $htdocsdest/tools + for htmlfile in `find .. -name '*.html'` ; do dir=`dirname $htmlfile` base=`basename $htmlfile .html` Deleted: trunk/sandbox/infrastructure/update-htmlfiles =================================================================== --- trunk/sandbox/infrastructure/update-htmlfiles 2011-12-27 21:05:27 UTC (rev 7281) +++ trunk/sandbox/infrastructure/update-htmlfiles 2011-12-27 21:13:50 UTC (rev 7282) @@ -1,33 +0,0 @@ -#!/bin/bash -# $Id$ -# -# Expect list of htmlfiles freshen with rst2html if there is -# a newer txt file besides. -# Used to initialise a docutils-update upload directory. - -# needs to be called in an already existing update-dir/aux/htdoce -# (see docutils-update.*) - -# requires rst2html in PATH. -# TODO change this to touch files. - -cat $1 | \ -while read F ; do - if test ${F: -4} == ".txt" ; then - TXT=$F - HTML=${F/\.txt/\.html} - elif test ${F: -5} == ".html" ; then - TXT=${F/\.html/\.txt} - HTML=$F - else - TXT="" - fi - if test -n "$TXT" ; then - if test -e "$TXT" -a "$TXT" -nt "$HTML" ; then - echo "Building $HTML from $TXT" - rst2html.py $TXT $HTML - fi - else - echo "Do not know what to do about: $F" - fi -done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2011-12-27 23:08:02
|
Revision: 7284 http://docutils.svn.sourceforge.net/docutils/?rev=7284&view=rev Author: grubert Date: 2011-12-27 23:07:56 +0000 (Tue, 27 Dec 2011) Log Message: ----------- get html file list for docs directory dynamic Modified Paths: -------------- trunk/sandbox/infrastructure/docutils-update.local trunk/sandbox/infrastructure/htmlfiles.lst Modified: trunk/sandbox/infrastructure/docutils-update.local =================================================================== --- trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 21:22:50 UTC (rev 7283) +++ trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 23:07:56 UTC (rev 7284) @@ -183,12 +183,25 @@ cd $htdocsdest # 2. generate empty and old html files to force generation -# TODO or generate for any txt under docs ? +# for any txt under docs ? +find docs -type f -and -name \*.txt -print | ( \ +while read -r txtfile ; do + dir=`dirname $txtfile` + base=`basename $txtfile .txt` + htmlfile=$dir/$base.html + if [ ! -e $htmlfile ] ; then + echo "touch $htmlfile" + touch -t 200001010101 $htmlfile + fi +done +) + +# for any file in htmlfilelist while read -r htmlfile ; do if [ ! -d `dirname $htmlfile` ] ; then echo "Old htmlfile entry: $htmlfile" elif [ ! -e $htmlfile ] ; then - echo "T: $htmlfile" + echo "touch $htmlfile" touch -t 200001010101 $htmlfile fi done < $htmlfilelist Modified: trunk/sandbox/infrastructure/htmlfiles.lst =================================================================== --- trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-27 21:22:50 UTC (rev 7283) +++ trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-27 23:07:56 UTC (rev 7284) @@ -8,53 +8,6 @@ BUGS.html FAQ.html docutils/parsers/rst/include/README.html -docs/howto/rst-directives.html -docs/howto/security.html -docs/howto/rst-roles.html -docs/howto/html-stylesheets.html -docs/howto/i18n.html -docs/peps/pep-0287.html -docs/peps/pep-0256.html -docs/peps/pep-0257.html -docs/peps/pep-0258.html -docs/api/runtime-settings.html -docs/api/cmdline-tool.html -docs/api/publisher.html -docs/ref/rst/directives.html -docs/ref/rst/introduction.html -docs/ref/rst/roles.html -docs/ref/rst/definitions.html -docs/ref/rst/restructuredtext.html -docs/ref/doctree.html -docs/ref/transforms.html -docs/dev/rst/alternatives.html -docs/dev/rst/problems.html -docs/dev/website.html -docs/dev/hacking.html -docs/dev/todo.html -docs/dev/semantics.html -docs/dev/distributing.html -docs/dev/policies.html -docs/dev/pysource.html -docs/dev/enthought-rfp.html -docs/dev/enthought-plan.html -docs/dev/testing.html -docs/dev/repository.html -docs/dev/release.html -docs/user/rst/demo.html -docs/user/rst/quickstart.html -docs/user/rst/cheatsheet.html -docs/user/slide-shows.html -docs/user/config.html -docs/user/odt.html -docs/user/docutils-05-compat.sty.html -docs/user/emacs.html -docs/user/manpage.html -docs/user/mailing-lists.html -docs/user/latex.html -docs/user/links.html -docs/user/tools.html -docs/index.html test/functional/expected/standalone_rst_html4css1.html test/functional/expected/misc_rst_html4css1.html test/functional/expected/dangerous.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2011-12-27 23:20:59
|
Revision: 7285 http://docutils.svn.sourceforge.net/docutils/?rev=7285&view=rev Author: grubert Date: 2011-12-27 23:20:53 +0000 (Tue, 27 Dec 2011) Log Message: ----------- get README.txt/html files in sandbox dynamic Modified Paths: -------------- trunk/sandbox/infrastructure/docutils-update.local trunk/sandbox/infrastructure/htmlfiles.lst Modified: trunk/sandbox/infrastructure/docutils-update.local =================================================================== --- trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 23:07:56 UTC (rev 7284) +++ trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 23:20:53 UTC (rev 7285) @@ -196,6 +196,19 @@ done ) +# for any README under sandbox +find sandbox -type f -and -name README.txt -print | ( \ +while read -r txtfile ; do + dir=`dirname $txtfile` + base=`basename $txtfile .txt` + htmlfile=$dir/$base.html + if [ ! -e $htmlfile ] ; then + echo "touch $htmlfile" + touch -t 200001010101 $htmlfile + fi +done +) + # for any file in htmlfilelist while read -r htmlfile ; do if [ ! -d `dirname $htmlfile` ] ; then Modified: trunk/sandbox/infrastructure/htmlfiles.lst =================================================================== --- trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-27 23:07:56 UTC (rev 7284) +++ trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-27 23:20:53 UTC (rev 7285) @@ -20,17 +20,12 @@ tools/editors/README.html tools/dev/README.html mirror/setext.html -sandbox/infrastructure/README.html -sandbox/mly/restblog/README.html sandbox/tibs/pysource/notes/string.html sandbox/dkuhlman/docutils/docs/rst/pythonlatex_quickref.html sandbox/wilk/french/quickstart-fr.html -sandbox/cben/rolehack/README.html sandbox/cben/make/Makefile.docutils.html -sandbox/cben/make/README.html sandbox/amk/abc/sample.html sandbox/ianb/wiki/docs/Wiki.html -sandbox/gschwant/htmlnav/README.html sandbox/gschwant/docfactory/doc/head.html sandbox/gschwant/docfactory/doc/navigation_l.html sandbox/gschwant/docfactory/doc/index.html @@ -41,18 +36,12 @@ sandbox/gschwant/docfactory/doc/screenshots.html sandbox/gschwant/docfactory/LICENSE.html sandbox/gschwant/docfactory/NOTES.html -sandbox/gschwant/docfactory/README.html -sandbox/README.html -sandbox/cliechti/aafigure/README.html -sandbox/cliechti/README.html sandbox/stylesheets/index.html sandbox/presentations/pycon2006/architecture-extending-and-embedding/demo/test.html sandbox/presentations/pycon2006/architecture-extending-and-embedding/presentation.html sandbox/presentations/pycon2007/doctrees-lightning-talk/footnote.html -sandbox/aafigure/README.html sandbox/OpenDocument/docs/odtwriter.html sandbox/OpenDocument/docs/plugins_proposal.html -sandbox/OpenDocument/README.html sandbox/py-rest-doc/sphinx/templates/genindex.html sandbox/py-rest-doc/sphinx/templates/page.html sandbox/py-rest-doc/sphinx/templates/layout.html @@ -77,29 +66,19 @@ sandbox/py-rest-doc/sphinx/templates/settings.html sandbox/py-rest-doc/sphinx/templates/_commentform.html sandbox/py-rest-doc/sphinx/templates/commentform.html -sandbox/package-doc/README.html sandbox/package-doc/soc-application.html sandbox/package-doc/soc-timeline.html sandbox/package-doc/multiple-input-files.html -sandbox/code-block-directive/tools/pygments-enhanced-front-ends/README.html sandbox/code-block-directive/docs/syntax-highlight.html sandbox/code-block-directive/docs/pygments_with_docutils-latex-problems.html -sandbox/code-block-directive/README.html sandbox/code-block-directive/rst2html-highlight.html sandbox/html4trans/docs/usage.html sandbox/html4trans/data/html4trans-sample.html -sandbox/html4trans/README.html -sandbox/latex-variants/tests/README.html -sandbox/latex-variants/README.html sandbox/latex-variants/docs/syntax-highlight-with-listings.html sandbox/rst2wordml/readme.html -sandbox/rst2chunkedhtml/README.html sandbox/html4strict/docs/sample-field-list-table-wrap.html sandbox/html4strict/docs/sample-field-list-table1.html sandbox/html4strict/docs/sample-html4css1.html sandbox/html4strict/docs/sample-html4css2.html sandbox/html4strict/docs/sample-field-list-hanging.html sandbox/html4strict/docs/sample-html4-strict-css1.html -sandbox/html4strict/README.html -sandbox/rst2pdf/README.html -sandbox/texinfo-writer/README.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2011-12-28 00:13:08
|
Revision: 7290 http://docutils.svn.sourceforge.net/docutils/?rev=7290&view=rev Author: grubert Date: 2011-12-28 00:13:02 +0000 (Wed, 28 Dec 2011) Log Message: ----------- update html files from .rst Modified Paths: -------------- trunk/sandbox/infrastructure/docutils-update.local trunk/sandbox/infrastructure/htmlfiles.lst Modified: trunk/sandbox/infrastructure/docutils-update.local =================================================================== --- trunk/sandbox/infrastructure/docutils-update.local 2011-12-27 23:57:56 UTC (rev 7289) +++ trunk/sandbox/infrastructure/docutils-update.local 2011-12-28 00:13:02 UTC (rev 7290) @@ -196,7 +196,7 @@ done ) -# for any README under sandbox +# for any README.txt under sandbox find sandbox -type f -and -name README.txt -print | ( \ while read -r txtfile ; do dir=`dirname $txtfile` @@ -225,11 +225,14 @@ for htmlfile in `find .. -name '*.html'` ; do dir=`dirname $htmlfile` base=`basename $htmlfile .html` - txtfile=$dir/$base.txt if [ "$base" == "standalone_rst_html4strict" ] ; then # breaks web update echo "skipped: $dir $base" - elif [ -e $txtfile ] ; then + else + txtfile=$dir/$base.txt + if [ ! -e $txtfile ] ; then + txtfile=$dir/$base.rst + fi if [ $unconditional -eq 1 -o $txtfile -nt $htmlfile ] ; then if [ "${base:0:4}" == "pep-" ] ; then test $feedback && echo "$txtfile (PEP)" || true Modified: trunk/sandbox/infrastructure/htmlfiles.lst =================================================================== --- trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-27 23:57:56 UTC (rev 7289) +++ trunk/sandbox/infrastructure/htmlfiles.lst 2011-12-28 00:13:02 UTC (rev 7290) @@ -24,7 +24,6 @@ sandbox/dkuhlman/docutils/docs/rst/pythonlatex_quickref.html sandbox/wilk/french/quickstart-fr.html sandbox/cben/make/Makefile.docutils.html -sandbox/amk/abc/sample.html sandbox/ianb/wiki/docs/Wiki.html sandbox/gschwant/docfactory/doc/head.html sandbox/gschwant/docfactory/doc/navigation_l.html @@ -37,6 +36,8 @@ sandbox/gschwant/docfactory/LICENSE.html sandbox/gschwant/docfactory/NOTES.html sandbox/stylesheets/index.html +sandbox/paultremblay/docs/rst/howto.html +sandbox/paultremblay/docs/rst/attribute_sets.html sandbox/presentations/pycon2006/architecture-extending-and-embedding/demo/test.html sandbox/presentations/pycon2006/architecture-extending-and-embedding/presentation.html sandbox/presentations/pycon2007/doctrees-lightning-talk/footnote.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2012-05-01 12:09:52
|
Revision: 7403 http://docutils.svn.sourceforge.net/docutils/?rev=7403&view=rev Author: grubert Date: 2012-05-01 12:09:45 +0000 (Tue, 01 May 2012) Log Message: ----------- rename the file Added Paths: ----------- trunk/sandbox/infrastructure/releasing-log.txt Removed Paths: ------------- trunk/sandbox/infrastructure/releaseing.log Deleted: trunk/sandbox/infrastructure/releaseing.log =================================================================== --- trunk/sandbox/infrastructure/releaseing.log 2012-05-01 12:08:33 UTC (rev 7402) +++ trunk/sandbox/infrastructure/releaseing.log 2012-05-01 12:09:45 UTC (rev 7403) @@ -1,37 +0,0 @@ -Releasing -========= - -:Contact: gr...@us..., doc...@us... -:Revision: $Revision: 7396 $ -:Date: $Date: 2012-04-29 11:18:23 +0200 (So, 29 Apr 2012) $ -:Copyright: This document has been placed in the public domain. - -Notes on what happend while releasing. - -Release 0.9 -=========== - -* python 2.3 unittest.TestCase has no assertTrue -* python 2.3 keyword dictionaries update method does not support kwargs - -Ignored test errors - -* python 2.3: unicode problems. 2.3 support is likely to be ended soon. - Systems with only 2.3 might not even know of unicode. - -* PIL ``AttributeError: 'module' object has no attribute 'Image'`` - - A problem in PIL ? - Tested and failiing on - - - ubuntu8.04, python 2.4, 2.5 - - ubuntu10.04, python 2.6 - - ubuntu11.10, python 2.7 - -* python 2.64rc1 has a different error message format:: - - Problems with "raw" directive path: - - InputError: [Errno 2] No such file or directory: 'non-existent.file'. - + InputError: (2, 'No such file or directory'). - - but not in python 2.6.7 Copied: trunk/sandbox/infrastructure/releasing-log.txt (from rev 7402, trunk/sandbox/infrastructure/releaseing.log) =================================================================== --- trunk/sandbox/infrastructure/releasing-log.txt (rev 0) +++ trunk/sandbox/infrastructure/releasing-log.txt 2012-05-01 12:09:45 UTC (rev 7403) @@ -0,0 +1,37 @@ +Releasing +========= + +:Contact: gr...@us..., doc...@us... +:Revision: $Revision: 7396 $ +:Date: $Date: 2012-04-29 11:18:23 +0200 (So, 29 Apr 2012) $ +:Copyright: This document has been placed in the public domain. + +Notes on what happend while releasing. + +Release 0.9 +=========== + +* python 2.3 unittest.TestCase has no assertTrue +* python 2.3 keyword dictionaries update method does not support kwargs + +Ignored test errors + +* python 2.3: unicode problems. 2.3 support is likely to be ended soon. + Systems with only 2.3 might not even know of unicode. + +* PIL ``AttributeError: 'module' object has no attribute 'Image'`` + + A problem in PIL ? + Tested and failiing on + + - ubuntu8.04, python 2.4, 2.5 + - ubuntu10.04, python 2.6 + - ubuntu11.10, python 2.7 + +* python 2.64rc1 has a different error message format:: + + Problems with "raw" directive path: + - InputError: [Errno 2] No such file or directory: 'non-existent.file'. + + InputError: (2, 'No such file or directory'). + + but not in python 2.6.7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2012-05-01 16:17:46
|
Revision: 7405 http://docutils.svn.sourceforge.net/docutils/?rev=7405&view=rev Author: grubert Date: 2012-05-01 16:17:40 +0000 (Tue, 01 May 2012) Log Message: ----------- add see also release.txt Modified Paths: -------------- trunk/sandbox/infrastructure/README.txt trunk/sandbox/infrastructure/release.sh Modified: trunk/sandbox/infrastructure/README.txt =================================================================== --- trunk/sandbox/infrastructure/README.txt 2012-05-01 16:07:54 UTC (rev 7404) +++ trunk/sandbox/infrastructure/README.txt 2012-05-01 16:17:40 UTC (rev 7405) @@ -30,6 +30,7 @@ from a developer machine. *The* current way to go. :`<release.sh>`_: The script to make releases_ of Docutils. + For usage details see `<release.txt>`_ :`<uploaddocutils.sh>`_: Upload files to http://docutils.sf.net/tmp/ using ``scp``, inserting the current date in the file name. @@ -53,4 +54,4 @@ .. _web site: http://docutils.sourceforge.net/docs/dev/website.html .. _Docutils Subversion repository: http://docutils.sourceforge.net/docs/dev/repository.html -.. _releases: http://docutils.sourceforge.net/docs/dev/release.html +.. _release.txt: http://docutils.sourceforge.net/docs/dev/release.html Modified: trunk/sandbox/infrastructure/release.sh =================================================================== --- trunk/sandbox/infrastructure/release.sh 2012-05-01 16:07:54 UTC (rev 7404) +++ trunk/sandbox/infrastructure/release.sh 2012-05-01 16:17:40 UTC (rev 7405) @@ -6,6 +6,8 @@ # Date: $Date$ # Copyright: This script has been placed in the public domain. +# USAGE see: docutils/docs/dev/release.txt + set -e function print_command() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2012-12-13 10:05:52
|
Revision: 7550 http://docutils.svn.sourceforge.net/docutils/?rev=7550&view=rev Author: grubert Date: 2012-12-13 10:05:42 +0000 (Thu, 13 Dec 2012) Log Message: ----------- add extracted release-test script note problems with dependencies Modified Paths: -------------- trunk/sandbox/infrastructure/release.sh trunk/sandbox/infrastructure/releasing-log.txt Added Paths: ----------- trunk/sandbox/infrastructure/release-test.sh Added: trunk/sandbox/infrastructure/release-test.sh =================================================================== --- trunk/sandbox/infrastructure/release-test.sh (rev 0) +++ trunk/sandbox/infrastructure/release-test.sh 2012-12-13 10:05:42 UTC (rev 7550) @@ -0,0 +1,66 @@ +#!/bin/bash + +# testing of a release tarball extracted from release.sh +# because if this breaks release.sh exits +# and running tests again 2.4 to 2.7 automatic never worked for me +# and 3.x is not included + +# Author: Lea Wiemann +# Contact: gr...@us... +# Revision: $Revision: 7548 $ +# Date: $Date: 2012-12-13 10:08:17 +0100 (Don, 13 Dez 2012) $ +# Copyright: This script has been placed in the public domain. + +py_ver=$1 + +docutils_ver=$2 + +echo "Testing the release tarball: docutils-${docutils_ver} under python$py_ver." + +echo "BUG: must be run as root/sudo to be able to remove/install into site-packages." + +test_dir=tarball_test +rm -rfv $test_dir +mkdir -p $test_dir || exit 1 +cd $test_dir || exit 1 +tar xzvf ../docutils-${docutils_ver}.tar.gz || exit 1 + +cd docutils-"$docutils_ver" || exit 1 + +echo "Deleting and installing Docutils on Python $py_ver." +echo "Press enter." +read +site_packages="/usr/local/lib/python$py_ver/site-packages" +echo "BUG prefers /usr/local too /usr" +if test ! -d "$site_packages"; then + site_packages="/usr/lib/python$py_ver/site-packages" +fi +if test ! -d "$site_packages"; then + echo "Error: \"$site_packages\" does not exist." + exit 1 +fi +if test -e "$site_packages/docutils-test"; then + echo "Error: \"$site_packages/docutils-test\" exists." + echo "removing left over from previous release. Ctrl-C to abort." + read + rm -rf $site_packages/docutils-test +fi +rm -rfv /usr/{local,}lib/python$py_ver/site-packages/{docutils'"$extras"'} +echo "TODO for python3 rm local build, but building takes a long time then " +python$py_ver setup.py install +echo +echo "Copying the test suite to the site-packages directory of Python $py_ver." +echo "TODO for python3 copy test3" +echo "Press enter." +read +cp -rv test "$site_packages/docutils-test" + +if test ! -d "$site_packages"; then + echo "Error: \"$site_packages\" does not exist." + exit 1 +fi +# BUG test-dependecies.py +# * breaks on record.txt access if not run as root +# * fails missing dependecies to png. +python$py_ver -u $site_packages/docutils-test/alltests.py + Modified: trunk/sandbox/infrastructure/release.sh =================================================================== --- trunk/sandbox/infrastructure/release.sh 2012-12-13 09:51:23 UTC (rev 7549) +++ trunk/sandbox/infrastructure/release.sh 2012-12-13 10:05:42 UTC (rev 7550) @@ -417,6 +417,7 @@ run cd .. echo 'Tarball built.' run cp docutils/dist/"$tarball" . + echo 'BETTER run release-test.sh manually for each installed python version.' confirm test_tarball echo "Testing documentation and uploading htdocs of version $new_ver..." confirm upload_htdocs Modified: trunk/sandbox/infrastructure/releasing-log.txt =================================================================== --- trunk/sandbox/infrastructure/releasing-log.txt 2012-12-13 09:51:23 UTC (rev 7549) +++ trunk/sandbox/infrastructure/releasing-log.txt 2012-12-13 10:05:42 UTC (rev 7550) @@ -8,6 +8,49 @@ Notes on what happend while releasing. +Release 0.10 +============ + +* same failures for some python2.6 versions :: + + Problems with "raw" directive path: + - InputError: [Errno 2] No such file or directory: 'non-existent.file'. + + InputError: (2, 'No such file or directory'). + +nothing than this, until testing release tarball, then :. + + ====================================================================== + FAIL: test_dependencies (__main__.RecordDependenciesTests) + ---------------------------------------------------------------------- + Traceback (most recent call last): + File "docutils-test/test_dependencies.py", line 61, in test_dependencies + self.assertEqual(record, expected) + AssertionError: [u'data/include.txt', u'data/raw.txt'] != [u'../docs/user/rst/images/title.png', + u'data/include.txt', u'data/raw.txt'] + + ====================================================================== + FAIL: test_dependencies_html (__main__.RecordDependenciesTests) + ---------------------------------------------------------------------- + Traceback (most recent call last): + File "docutils-test/test_dependencies.py", line 74, in test_dependencies_html + self.assertEqual(record, expected) + AssertionError: [u'data/include.txt', u'data/raw.txt'] != [u'../docs/user/rst/images/biohazard.png', + u'../docs/user/rst/images/title.png', u'data/include.txt', u'data/raw.txt'] + + ====================================================================== + FAIL: test_dependencies_latex (__main__.RecordDependenciesTests) + ---------------------------------------------------------------------- + Traceback (most recent call last): + File "docutils-test/test_dependencies.py", line 89, in test_dependencies_latex + self.assertEqual(record, expected) + AssertionError: [u'data/include.txt', u'data/raw.txt'] != [u'../docs/user/rst/images/title.png', + u'data/include.txt', u'data/raw.txt'] + +if executed as non-adminuser :: + + SystemMessage: data/dependencies.txt:9: (SEVERE/4) Problems with "include" directive path: + OutputError: [Errno 13] Permission denied: 'record.txt'. + Release 0.9.1 ============= @@ -52,7 +95,7 @@ - ubuntu10.04, python 2.6 - ubuntu11.10, python 2.7 -* python 2.64rc1 has a different error message format:: +* python 2.6.4rc1 has a different error message format:: Problems with "raw" directive path: - InputError: [Errno 2] No such file or directory: 'non-existent.file'. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2012-12-18 08:23:07
|
Revision: 7576 http://docutils.svn.sourceforge.net/docutils/?rev=7576&view=rev Author: grubert Date: 2012-12-18 08:23:00 +0000 (Tue, 18 Dec 2012) Log Message: ----------- use release-test.sh in release.sh Modified Paths: -------------- trunk/sandbox/infrastructure/README.txt trunk/sandbox/infrastructure/release-test.sh trunk/sandbox/infrastructure/release.sh Modified: trunk/sandbox/infrastructure/README.txt =================================================================== --- trunk/sandbox/infrastructure/README.txt 2012-12-18 07:56:06 UTC (rev 7575) +++ trunk/sandbox/infrastructure/README.txt 2012-12-18 08:23:00 UTC (rev 7576) @@ -12,25 +12,24 @@ The `infrastructure <.>`_ sandbox directory stores any scripts that are needed for the development of the Docutils project. -TODOs: +:`<docutils-update.local>`_: The script to update the `web site`_ + from a developer machine or on shell.sourceforge. -* subversion is now on sourceforge - - change release and update + If a file ``ON_SOURCEFORGE`` exists in current dorectory, the + script assumes being executed on shell.sourceforge. -* sourceforge does not have cron, but berlios installation - did not work since long time. +:`<release.sh>`_: The script to make releases_ of Docutils. + For usage details see `<release.txt>`_ -* clean up. - -Overview: + TODO : less sudo ? must test-directory be installed ?NO? -Everything below this needs rework. +:`<release-test.sh>`_: The script to run tests at release time, extracted + from ``release.sh``. -:`<docutils-update.local>`_: The script to update the `web site`_ - from a developer machine. *The* current way to go. +Everything below this line needs rework +--------------------------------------- -:`<release.sh>`_: The script to make releases_ of Docutils. - For usage details see `<release.txt>`_ +Overview: :`<uploaddocutils.sh>`_: Upload files to http://docutils.sf.net/tmp/ using ``scp``, inserting the current date in the file name. Modified: trunk/sandbox/infrastructure/release-test.sh =================================================================== --- trunk/sandbox/infrastructure/release-test.sh 2012-12-18 07:56:06 UTC (rev 7575) +++ trunk/sandbox/infrastructure/release-test.sh 2012-12-18 08:23:00 UTC (rev 7576) @@ -54,6 +54,8 @@ echo "ATTENTION: some parts must be run as root/sudo to be able to remove/install into site-packages." +START_DIR=`pwd` + test_dir=tarball_test run rm -rf $test_dir run mkdir -p $test_dir @@ -90,15 +92,28 @@ sudo python$py_ver setup.py install echo echo "Copying the test suite to the site-packages directory of Python $py_ver (sudo)." -echo "TODO for python3 copy test3" -echo "Press enter." +echo "TODO for python3 copy test3. Ennter.to continue." read sudo cp -rv test "$site_packages/docutils-test" # BUG test-dependecies.py # * breaks on record.txt access if not run as root -# * fails missing dependecies to png. +# * fails missing dependencies to files in docutils/docs. -echo "run alltests. sudo again because alltests.out will be created in $site_packages/docutils-test" -sudo python$py_ver -u $site_packages/docutils-test/alltests.py +echo "run alltests.py" +# run locally so we do not require sudo to create +# site_packages/docutils-test/alltests.out +# copy to a directory and execute there to avoid usage +# of local docutils source. +test_run_dir=tmp-docutils-test +cp -r test $test_run_dir +mkdir -p $test_run_dir +cd $test_run_dir +python$py_ver -u test/alltests.py + +echo "remove test directory Ctrl C to abort" +read +cd $START_DIR +rm -rfv $test_dir + Modified: trunk/sandbox/infrastructure/release.sh =================================================================== --- trunk/sandbox/infrastructure/release.sh 2012-12-18 07:56:06 UTC (rev 7575) +++ trunk/sandbox/infrastructure/release.sh 2012-12-18 08:23:00 UTC (rev 7576) @@ -8,6 +8,9 @@ # USAGE see: docutils/docs/dev/release.txt +# must be run from docutils trunk/docutils, +# because HISTORY and RELEASE_NOTES.txt are modified. + set -e function print_command() @@ -209,59 +212,14 @@ confirm tar xzvf "../$tarball" echo run cd docutils-"$new_ver" - echo 'Installing the distribution.' - confirm su -c ' - for py_ver in '"$python_versions"'; do - echo "Deleting and installing Docutils on Python $py_ver." - echo "Press enter." - read - site_packages="/usr/local/lib/python$py_ver/site-packages" - echo "BUG prefers /usr/local too /usr" - if test ! -d "$site_packages"; then - site_packages="/usr/lib/python$py_ver/site-packages" - fi - if test ! -d "$site_packages"; then - echo "Error: \"$site_packages\" does not exist." - exit 1 - fi - if test -e "$site_packages/docutils-test"; then - echo "Error: \"$site_packages/docutils-test\" exists." - echo "removing left over from previous release. Ctrl-C to abort." - read - rm -rf $site_packages/docutils-test - fi - echo "TODO for python3 rm local build, but building takes a long time then " - python$py_ver setup.py install - echo - echo "Copying the test suite to the site-packages directory of Python $py_ver." - echo "TODO for python3 copy test3" - echo "Press enter." - read - cp -rv test "$site_packages/docutils-test" - done' - echo - echo 'Running the test suite as root with all Python versions.' - for py_ver in $python_versions; do - site_packages="/usr/local/lib/python$py_ver/site-packages" - if test ! -d "$site_packages"; then - site_packages="/usr/lib/python$py_ver/site-packages" - fi - if test ! -d "$site_packages"; then - echo "Error: \"$site_packages\" does not exist." - exit 1 - fi - # BUG - echo "WARNING shell script exits if any test fails, maybe run in separate shell." - confirm su -c "python$py_ver -u \"$site_packages/docutils-test/alltests.py\"" + echo 'Deleteing old installations. Installing the distribution.' + echo "WARN: might not find installation." + for py_ver in '"$python_versions"'; do + echo "python$py_ver install/update and test." + bash release-test.sh + echo "Enter to test next." + read done - run cd ../.. - echo "Cleaning up..." - confirm su -c "rm -rf tarball_test" - confirm su -c ' - for py_ver in '"$python_versions"'; do - rm -rfv /usr{/local,}/lib/python$py_ver/site-packages/docutils{-test,} - done' - echo } function upload_tarball() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2013-07-12 10:04:04
|
Revision: 7682 http://sourceforge.net/p/docutils/code/7682 Author: grubert Date: 2013-07-12 10:04:01 +0000 (Fri, 12 Jul 2013) Log Message: ----------- knowledge gained on macosx sed. Modified Paths: -------------- trunk/sandbox/infrastructure/release.sh trunk/sandbox/infrastructure/releasing-log.txt Modified: trunk/sandbox/infrastructure/release.sh =================================================================== --- trunk/sandbox/infrastructure/release.sh 2013-07-12 07:52:27 UTC (rev 7681) +++ trunk/sandbox/infrastructure/release.sh 2013-07-12 10:04:01 UTC (rev 7682) @@ -157,6 +157,7 @@ echo "Subversion root URL: $svnroot" if test "$svnurl" = "$svnroot"; then echo 'Error: Subversion URL and Subversion root URL are the same.' + echo ' probably a MacOSX sed problem.' exit 1 fi echo -n 'Detecting current Docutils version... ' Modified: trunk/sandbox/infrastructure/releasing-log.txt =================================================================== --- trunk/sandbox/infrastructure/releasing-log.txt 2013-07-12 07:52:27 UTC (rev 7681) +++ trunk/sandbox/infrastructure/releasing-log.txt 2013-07-12 10:04:01 UTC (rev 7682) @@ -11,6 +11,9 @@ Release 0.11 ============ +Tests +----- + * ubuntu 8.04 2.4.5, 2.5.2, 2.6.7, 2.7.2 OK python 2.6.4rc1 6 failure due to change in error message: no such file ... @@ -23,6 +26,14 @@ python 3.2: roman.py for py3 required. + +Release.sh +---------- + +release.sh does not work on MacOSX. + + + Release 0.10 ============ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2016-12-09 12:35:59
|
Revision: 7987 http://sourceforge.net/p/docutils/code/7987 Author: grubert Date: 2016-12-09 12:35:56 +0000 (Fri, 09 Dec 2016) Log Message: ----------- fix release_test.sh Modified Paths: -------------- trunk/sandbox/infrastructure/release-test.sh trunk/sandbox/infrastructure/releasing-log.txt Modified: trunk/sandbox/infrastructure/release-test.sh =================================================================== --- trunk/sandbox/infrastructure/release-test.sh 2016-12-09 11:08:21 UTC (rev 7986) +++ trunk/sandbox/infrastructure/release-test.sh 2016-12-09 12:35:56 UTC (rev 7987) @@ -83,10 +83,10 @@ python$py_ver setup.py build sudo python$py_ver setup.py install echo -echo "Remove dcoutils code directory from tarball_test to make sure it is not used.." +echo "Remove __init__.py from docutils code directory to make sure it is not used.." echo "TODO for python3." read -rm -rf docutils +rm -rf docutils/__init__.py # BUG test-dependecies.py # * breaks on record.txt access if not run as root Modified: trunk/sandbox/infrastructure/releasing-log.txt =================================================================== --- trunk/sandbox/infrastructure/releasing-log.txt 2016-12-09 11:08:21 UTC (rev 7986) +++ trunk/sandbox/infrastructure/releasing-log.txt 2016-12-09 12:35:56 UTC (rev 7987) @@ -32,25 +32,26 @@ * ubuntu 12.04 python 2.7.3: OK * ubuntu 12.04 python 3.2.3: OK -testing tarball 0.13.1 (build sdist) :: +* testing tarball 0.13.1 (build sdist) :: - +++ functional/output/standalone_rst_html5.html - @@ -7,9 +7,9 @@ - <meta name="author" content="David Goodger" /> - <meta content="reStructuredText, test, parser" name="keywords" /> - <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" /> - -<link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> - -<link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> - -<link rel="stylesheet" href="../input/data/math.css" type="text/css" /> - +<link rel="stylesheet" href="../../minimal.css" type="text/css" /> - +<link rel="stylesheet" href="../../plain.css" type="text/css" /> - +<link rel="stylesheet" href="../../math.css" type="text/css" /> - </head> - <body> - <div class="header"> + +++ functional/output/standalone_rst_html5.html + @@ -7,9 +7,9 @@ + <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" /> + -<link rel="stylesheet" href="../input/data/minimal.css" type="text/css" /> + -<link rel="stylesheet" href="../input/data/plain.css" type="text/css" /> + -<link rel="stylesheet" href="../input/data/math.css" type="text/css" /> + +<link rel="stylesheet" href="../../minimal.css" type="text/css" /> + +<link rel="stylesheet" href="../../plain.css" type="text/css" /> + +<link rel="stylesheet" href="../../math.css" type="text/css" /> + </head> - IN WORK + this is because ``test/functional/input/data/minimal.css`` is a symlink to + ``../../../../docutils/writers/html5_polyglot/minimal.css`` and release_test.sh + removes directory docutils to ensure the test uses the installed docutils + not the unzipped. + FIX: remove docutils/__init__.py + Release 0.12 ============ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2017-06-10 14:43:35
|
Revision: 8108 http://sourceforge.net/p/docutils/code/8108 Author: grubert Date: 2017-06-10 14:43:32 +0000 (Sat, 10 Jun 2017) Log Message: ----------- rename step_1.sh to set_version.sh Added Paths: ----------- trunk/sandbox/infrastructure/set_version.sh Removed Paths: ------------- trunk/sandbox/infrastructure/step_1.sh Copied: trunk/sandbox/infrastructure/set_version.sh (from rev 8106, trunk/sandbox/infrastructure/step_1.sh) =================================================================== --- trunk/sandbox/infrastructure/set_version.sh (rev 0) +++ trunk/sandbox/infrastructure/set_version.sh 2017-06-10 14:43:32 UTC (rev 8108) @@ -0,0 +1,78 @@ +#!/bin/bash + +# set version number and description + +# Author: engelbert gruber (taken from Lea Wiemann's release.sh) +# Contact: gr...@us... +# Revision: $Revision$ +# Date: $Date$ +# Copyright: This script has been placed in the public domain. + +# USAGE see: docutils/docs/dev/release.txt + +# must be run from docutils trunk/docutils, +# because HISTORY and RELEASE_NOTES.txt are modified. + +set -e + +echo "Change version number and description" +if [ -z "$1" -o -z "$2" ] ; then + echo "USAGE" + echo " step_1.sh new-description new-version-number" + echo "" + echo "Description might be: repository prerelease release" + echo "" + echo "Version number: major.minor.micro" + echo " micro is for bug-fix releases and left out on new minor-numbers" + echo " prereleases get '(a|b|rc)#' appended" + echo "" + echo "Samples" + echo " 0.14 0.14a0 0.14rc1 0.20.1a0" + exit +fi + +# new description: repository prerelease release +new_desc=$1 + +echo -n 'Detecting current Docutils version... ' +old_ver="`python -c 'import docutils; print docutils.__version__'`" + +new_ver=$2 + +echo "version ${old_ver} to ${new_ver}" +echo "description to ${new_desc}" + +function set_ver() +{ + # Parameters: old_version new_version + shopt -s extglob + echo Determining list of files to be changed... + # BUG ls lists directories but does not descend + files="docutils/__init__.py setup.py `$svn ls test/functional/expected/ | sed 's|^|test/functional/expected/|'`" + echo "Now I'll change the version number to $2 in the following files:" + echo $files + echo + echo 'Press enter to proceed (or enter anything to skip)...' + read + if [ ! "$REPLY" ]; then + echo 'Modifying files with ed...' + old_ver_regex="`echo "$1" | sed 's/\./\\\\./g'`" + # "ed" returns an error code if there has been no substitution, so + # we temporarily deactivate exit-on-error. + set +e + for F in $files; do + (echo ",s/$old_ver_regex/$2/g"; echo 'wq') | ed "$F" + done + set -e + fi + echo + echo 'CAUTION: please look at the diffs carefully, for wrongly' + echo ' replaced embedded numbers.' +# checkin "set version number to $2" $files +} + +# update __version_details__ string +(echo ",s/^__version_details__ = .*\$/__version_details__ = '${new_desc}'/"; + echo wq) | ed docutils/__init__.py 2> /dev/null +set_ver "$old_ver" "$new_ver" + Deleted: trunk/sandbox/infrastructure/step_1.sh =================================================================== --- trunk/sandbox/infrastructure/step_1.sh 2017-06-10 14:43:00 UTC (rev 8107) +++ trunk/sandbox/infrastructure/step_1.sh 2017-06-10 14:43:32 UTC (rev 8108) @@ -1,78 +0,0 @@ -#!/bin/bash - -# set version number and description - -# Author: engelbert gruber (taken from Lea Wiemann's release.sh) -# Contact: gr...@us... -# Revision: $Revision$ -# Date: $Date$ -# Copyright: This script has been placed in the public domain. - -# USAGE see: docutils/docs/dev/release.txt - -# must be run from docutils trunk/docutils, -# because HISTORY and RELEASE_NOTES.txt are modified. - -set -e - -echo "Change version number and description" -if [ -z "$1" -o -z "$2" ] ; then - echo "USAGE" - echo " step_1.sh new-description new-version-number" - echo "" - echo "Description might be: repository prerelease release" - echo "" - echo "Version number: major.minor.micro" - echo " micro is for bug-fix releases and left out on new minor-numbers" - echo " prereleases get '(a|b|rc)#' appended" - echo "" - echo "Samples" - echo " 0.14 0.14a0 0.14rc1 0.20.1a0" - exit -fi - -# new description: repository prerelease release -new_desc=$1 - -echo -n 'Detecting current Docutils version... ' -old_ver="`python -c 'import docutils; print docutils.__version__'`" - -new_ver=$2 - -echo "version ${old_ver} to ${new_ver}" -echo "description to ${new_desc}" - -function set_ver() -{ - # Parameters: old_version new_version - shopt -s extglob - echo Determining list of files to be changed... - # BUG ls lists directories but does not descend - files="docutils/__init__.py setup.py `$svn ls test/functional/expected/ | sed 's|^|test/functional/expected/|'`" - echo "Now I'll change the version number to $2 in the following files:" - echo $files - echo - echo 'Press enter to proceed (or enter anything to skip)...' - read - if [ ! "$REPLY" ]; then - echo 'Modifying files with ed...' - old_ver_regex="`echo "$1" | sed 's/\./\\\\./g'`" - # "ed" returns an error code if there has been no substitution, so - # we temporarily deactivate exit-on-error. - set +e - for F in $files; do - (echo ",s/$old_ver_regex/$2/g"; echo 'wq') | ed "$F" - done - set -e - fi - echo - echo 'CAUTION: please look at the diffs carefully, for wrongly' - echo ' replaced embedded numbers.' -# checkin "set version number to $2" $files -} - -# update __version_details__ string -(echo ",s/^__version_details__ = .*\$/__version_details__ = '${new_desc}'/"; - echo wq) | ed docutils/__init__.py 2> /dev/null -set_ver "$old_ver" "$new_ver" - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2021-04-17 08:57:39
|
Revision: 8693 http://sourceforge.net/p/docutils/code/8693 Author: grubert Date: 2021-04-17 08:57:37 +0000 (Sat, 17 Apr 2021) Log Message: ----------- the plan for cross version testing Added Paths: ----------- trunk/sandbox/infrastructure/crosstest/ trunk/sandbox/infrastructure/crosstest/index.txt Added: trunk/sandbox/infrastructure/crosstest/index.txt =================================================================== --- trunk/sandbox/infrastructure/crosstest/index.txt (rev 0) +++ trunk/sandbox/infrastructure/crosstest/index.txt 2021-04-17 08:57:37 UTC (rev 8693) @@ -0,0 +1,29 @@ +=================== +docutils cross test +=================== + +:Date: $Date$ + +Testing against/with/through several python installations. + +tox does this ... somehow ... trying to do it explicit. + +plan +---- + +* setup a virtual environment with every python +* build a wheel with every python (in the venv ?) + + before build clean docutils:: + + find . -type f -name "*.pyc" -delete + +* test every wheel in every venv +* test with LC_ALL=C +* test with PYTHONPATH= +* test with PYTHONWARNINGS=default + + this shows deprecation warnings. + + + Property changes on: trunk/sandbox/infrastructure/crosstest/index.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2021-04-17 14:03:18
|
Revision: 8707 http://sourceforge.net/p/docutils/code/8707 Author: grubert Date: 2021-04-17 14:03:16 +0000 (Sat, 17 Apr 2021) Log Message: ----------- release 0.17.1 to testpypi Modified Paths: -------------- trunk/sandbox/infrastructure/crosstest/t.sh trunk/sandbox/infrastructure/releasing-log.txt Modified: trunk/sandbox/infrastructure/crosstest/t.sh =================================================================== --- trunk/sandbox/infrastructure/crosstest/t.sh 2021-04-17 13:05:29 UTC (rev 8706) +++ trunk/sandbox/infrastructure/crosstest/t.sh 2021-04-17 14:03:16 UTC (rev 8707) @@ -1,7 +1,9 @@ #!/bin/sh -# test +# test local wheel WHL=../docutils-0.17.1b2.dev0-py2.py3-none-any.whl +WHL=TESTPYPI +# PRE = for VDIR in ./py3.* ; do echo "$VDIR" @@ -11,7 +13,14 @@ export PYTHONPATH= ; . bin/activate export PYTHONWARNINGS=default export LC_ALL=C - python -m pip install $WHL + if [ -e $WHL ] ; then + python -m pip install $WHL + elif [ $WHL = "TESTPYPI" ] ; then + python -m pip install --no-cache-dir --index-url https://test.pypi.org/simple/ --no-deps docutils + python -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps docutils + else + python -m pip install $WHL + fi cp -Lr ~/projects/docutils-code/docutils/test . python test/alltests.py read X Modified: trunk/sandbox/infrastructure/releasing-log.txt =================================================================== --- trunk/sandbox/infrastructure/releasing-log.txt 2021-04-17 13:05:29 UTC (rev 8706) +++ trunk/sandbox/infrastructure/releasing-log.txt 2021-04-17 14:03:16 UTC (rev 8707) @@ -31,6 +31,22 @@ pinning to docutils 0.16 helped ... why ? +Release 0.17.1 (2021-04-16) +=========================== + +* tox with 2.7 3.5, 3.6, 3.7, 3.8, 3.9, 3.10 +* set_version 0.17.1 +* tox again +* commit : release 0.17.1 +* Generate universal wheel and source-distribution with py38. +* Upload universal wheel and source to test.pypi. +* test in venvs ... and then next problem pypi caches 0.17.1b2. + + --no-cache-dir does not help. + + call twice, secodn time with ``--upgrade``. + + Release 0.17.1 (2021-04-12 ...) =============================== @@ -43,8 +59,11 @@ testing against development source passes. - too late to release maybe tomorrow. + Test crosstest, see subdirectory + 3.7 and 3.10 require libffi-dev to build local + then tox passes for 3.5 to 3.10. + Release 0.17.1b1 (2021-04-09) ============================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |