[SQL-CVS] SQLObject development repository branch master updated. 3.2.0-3-gac3e39d

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  ac3e39da98448311e97d070dce6436d36750bcfd (commit)
       via  8926bcf778dcf4789328618a155cdcbaa8bc2162 (commit)
      from  80fa7be57fa66d9acfcdc3abde1d4098bb2da12f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/ac3e39da98448311e97d070dce6436d36750bcfd

commit ac3e39da98448311e97d070dce6436d36750bcfd
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Mar 19 05:02:12 2017 +0300

    Convert scripts repository to devscripts subdirectory
    
    Some of thses scripts are version-dependent so it's better to have them
    in the main repo.
    
    [skip ci]

diff --git a/devscripts/BRANCH-CHECKLIST b/devscripts/BRANCH-CHECKLIST
new file mode 100644
index 0000000..4e64f48
--- /dev/null
+++ b/devscripts/BRANCH-CHECKLIST
@@ -0,0 +1,32 @@
+0. Run full test suite in master. Continue if all tests passed.
+
+1. If the branching point is master run ../branch $NEW_BRANCH. If it's
+not master run ../branch $NEW_BRANCH $TREEISH, where $TREEISH is
+a branch, a commit id or a tag.
+
+1a. The script creates a new branch and calls editor; edit README.rst,
+    __version__.py and News.rst in the branch - set version. In
+    setup.cfg in the branch edit section [publish] - uncomment doc-dest
+    for stable branch. In setup.py in the branch edit URL (remove
+    '/devel') and download URL. In setup.py and DeveloperGuide.rst edit
+    Travis CI build status image URL (change branch). Commit.
+
+1b. If the branching point was master the script checks out master and
+    calls editor again; edit README.rst, __version__.py and News.rst in
+    master - set version for the next release. Edit branch in
+    appveyor.yml. In setup.py edit "Development Status" in trove
+    classifiers. Commit.
+
+1c. If the branching point was master the script updates versions in
+    SQLObject-master.rst. If the branching point was not master the
+    script updates versions in SQLObject-$branch.rst.
+
+2. To deprecate a version of Python edit files docs/News.rst,
+   docs/SQLObject.rst, docs/TODO.rst, sqlobject/main.py, README.rst and
+   setup.py in master.
+
+3. Do a null-merge from the new branch to the higher branch or the
+   master.
+
+4. Run ../push-all to push all branches and tags to the public
+   repositories.
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
new file mode 100644
index 0000000..acfc14f
--- /dev/null
+++ b/devscripts/RELEASE-CHECKLIST
@@ -0,0 +1,50 @@
+0. Run full test suite in all branches and in master. Continue if all
+   tests passed.
+
+1. Check out the release branch. If it is a stable release - edit
+   docs/News.rst to set release date. Commit. If it's not master - merge
+   to all higher branches and master.
+
+2. If release branch is not master - run ../prerelease $NEW_TAG; if it's
+   master - run ../prerelease $NEW_TAG master.
+
+2a. The script checks out the release branch and calls editor; edit
+   __version__.py and README.rst in the release branch - fix versions.
+   Edit section [egg_info] in setup.cfg - set if it is a stable or
+   development release. In setup.py edit "Development Status" in trove
+   classifiers; edit download URL: if a non-stable version - append
+   'dev' and date stamp, for a stable version remove 'dev' and date
+   stamp). Commit. Verify.
+
+3. If it's not master - null-merge to the next higher branch.
+
+4. If release branch is not master - run ../prerelease-tag $NEW_TAG; if
+   it's master - run ../prerelease-tag $NEW_TAG master. This checks out
+   the release branch and creates the new tag at the head of the release
+   branch.
+
+5. Update version, the list of changes, the list of contributors and
+   download URL in SQLObject-$branch.rst.
+
+6. Run ../release. This generates and uploads new archives to PyPI and
+   if it is a stable release - uploads archives and release announcement
+   (SQLObject-$branch.rst) to SourceForge.
+
+7. Hide/show old releases at PyPI and SourceForge.
+
+8. If it's the first stable release of the branch - edit build-all-docs,
+   advance stable branch. If it's a stable release edit stable tag at
+   ReadTheDocs. Generate new docs using ./build-all-docs. Commit generated
+   docs. Upload docs using ./publish-docs.
+
+9. Run ../push-all in the development repository to push all branches
+   and tags to the public repositories.
+
+10. Announce new release(s) at Twitter (https://twitter.com/SQLObject) and
+    Wikipedia (https://en.wikipedia.org/wiki/SQLObject). If it is a stable
+   release - announce it at
+   https://en.wikipedia.org/wiki/Comparison_of_object-relational_mapping_software.
+
+11. Send announcement to the SQLObject mailing list. For a stable
+    release send announcements to python, python-announce and python-db
+    mailing lists.
diff --git a/devscripts/add-remotes b/devscripts/add-remotes
new file mode 100755
index 0000000..3b664bd
--- /dev/null
+++ b/devscripts/add-remotes
@@ -0,0 +1,29 @@
+#! /bin/sh
+
+if [ -z "$2" ]; then
+   echo "Usage: $0 sf-url gl-url gh-url" >&2
+   exit 1
+fi
+
+sf_url="$1"
+gl_url="$2"
+gh_url="$3"
+
+if ! echo "$sf_url" | grep -q ^$USER@git\\.code\\.sf\\.net:/p/sqlobject/; then
+   echo "Usage: $0 SF-URL gl-url gh-url" >&2
+   exit 1
+fi
+
+if ! echo "$gl_url" | grep -q ^gi...@gi...:sqlobject/; then
+   echo "Usage: $0 sf-url GL-URL gh-url" >&2
+   exit 1
+fi
+
+if ! echo "$gh_url" | grep -q ^gi...@gi...:sqlobject/; then
+   echo "Usage: $0 sf-url gl-url GH-URL" >&2
+   exit 1
+fi
+
+     git remote add sf "$sf_url" &&
+     git remote add gl "$gl_url" &&
+exec git remote add gh "$gh_url"
diff --git a/devscripts/branch b/devscripts/branch
new file mode 100755
index 0000000..e3d4771
--- /dev/null
+++ b/devscripts/branch
@@ -0,0 +1,56 @@
+#! /bin/sh
+
+if [ -z "$1" -o -n "$3" ]; then
+   echo "Usage: $0 branch [treeish]" >&2
+   exit 1
+fi
+
+branch="$1"
+treeish="$2"
+
+. `dirname $0`/split.sh &&
+branch="$1"
+
+if [ -z "$treeish" ]; then
+   treeish="master"
+fi
+
+split_tag "`git describe --abbrev=0 \"$treeish\"`"
+prev_branch="$major.$minor"
+
+split_tag $branch
+next_minor="`expr $minor + 1`"
+
+git checkout -b "$branch" "$treeish" &&
+echo "
+version = '$major.$minor'
+major = $major
+minor = $minor
+micro = 0
+release_level = 'branch'
+serial = 0
+version_info = (major, minor, micro, release_level, serial)" > sqlobject/__version__.py &&
+`git var GIT_EDITOR` README.rst sqlobject/__version__.py docs/News.rst setup.cfg setup.py docs/DeveloperGuide.rst &&
+git commit --message="Branch $branch" README.rst sqlobject/__version__.py docs/News.rst setup.cfg setup.py docs/DeveloperGuide.rst &&
+
+if [ "$treeish" = master ]; then
+   git checkout master && echo "
+version = '$major.$next_minor'
+major = $major
+minor = $next_minor
+micro = 0
+release_level = 'trunk'
+serial = 0
+version_info = (major, minor, micro, release_level, serial)" > sqlobject/__version__.py &&
+   `git var GIT_EDITOR` README.rst sqlobject/__version__.py docs/News.rst appveyor.yml setup.py &&
+   git commit --message="Next branch will be $major.$next_minor" README.rst sqlobject/__version__.py docs/News.rst setup.py &&
+
+   cd .. &&
+   cp -p SQLObject-master.rst SQLObject-"$branch".rst &&
+   exec ./replace "$major\.$minor" "$major.$next_minor" SQLObject-master.rst
+
+else
+   cd .. &&
+   cp -p SQLObject-"$prev_branch".rst SQLObject-"$branch".rst &&
+   exec ./replace "$prev_branch" "$major.$next_minor" SQLObject-"$branch".rst
+fi
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
new file mode 100755
index 0000000..e16b726
--- /dev/null
+++ b/devscripts/build-all-docs
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+build_docs() {
+   git checkout "$1" &&
+   ../build-docs &&
+   rsync -ahP --del --exclude=.git --exclude=.gitlab-ci.yml \
+      --exclude=.nojekyll docs/html/ ../SQLObject-docs/"$2"/
+}
+
+cd "`dirname \"$0\"`"/SQLObject &&
+build_docs 3.2.0 &&
+build_docs master devel &&
+
+cd ../SQLObject-docs &&
+exec git status
diff --git a/devscripts/build-docs b/devscripts/build-docs
new file mode 100755
index 0000000..8f9895b
--- /dev/null
+++ b/devscripts/build-docs
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+cd "`dirname \"$0\"`"/SQLObject &&
+cd docs &&
+exec ./rebuild
diff --git a/devscripts/cleanup b/devscripts/cleanup
new file mode 100755
index 0000000..fa38d79
--- /dev/null
+++ b/devscripts/cleanup
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+cd "`dirname $0`" &&
+find . \( -name \*.orig -o -name \*.rej -o -name \*.tmp \) -type f -delete &&
+exec rm -f /tmp/test-sqlite.sqdb*
diff --git a/devscripts/flake8/.gitignore b/devscripts/flake8/.gitignore
new file mode 100644
index 0000000..d2eae24
--- /dev/null
+++ b/devscripts/flake8/.gitignore
@@ -0,0 +1,5 @@
+E*
+F*
+W*
+all-results
+sort-by-lines
diff --git a/devscripts/flake8/run b/devscripts/flake8/run
new file mode 100755
index 0000000..2000dd6
--- /dev/null
+++ b/devscripts/flake8/run
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+flake8 ../SQLObject | sort >all-results &&
+awk '{print $2}' all-results | sort | uniq -c |
+   sort -k 1,1nr -k 2,2 >sort-by-lines
diff --git a/devscripts/flake8/split b/devscripts/flake8/split
new file mode 100755
index 0000000..958b758
--- /dev/null
+++ b/devscripts/flake8/split
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+while read _count code; do
+   grep -F " $code " all-results | sort -t : -k 1,1 -k 2,2nr >"$code"
+done <sort-by-lines
diff --git a/devscripts/git-hooks/post-checkout b/devscripts/git-hooks/post-checkout
new file mode 100755
index 0000000..2bd5be0
--- /dev/null
+++ b/devscripts/git-hooks/post-checkout
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# post-checkout hook: compile python files to byte code
+
+prev_HEAD="$1"
+new_HEAD="$2"
+new_branch="$3"
+
+if [ "$new_branch" = 1 ]; then
+   # if branch was changed - remove old bytecode files,
+   # empty directories and outdated docs
+   find . -name '*.py[co]' -delete &&
+   for d in sqlobject/include/pydispatch sqlobject/include/tests; do
+      if [ "`echo $d/*`" = "$d/*" ]; then rm -rf $d; fi
+   done &&
+   rm -rf docs/html
+fi &&
+
+python    -m compileall -q -x '\.tox/.+' . &&
+python -O -m compileall -q -x '\.tox/.+' .
+
+exit 0
diff --git a/devscripts/git-hooks/post-merge b/devscripts/git-hooks/post-merge
new file mode 100755
index 0000000..633a1d0
--- /dev/null
+++ b/devscripts/git-hooks/post-merge
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# post-merge hook that compiles python files to byte code
+
+python    -m compileall -q -x '\.tox/.+' . &&
+python -O -m compileall -q -x '\.tox/.+' .
+
+exit 0
diff --git a/devscripts/git-hooks/post-rewrite b/devscripts/git-hooks/post-rewrite
new file mode 100755
index 0000000..df28442
--- /dev/null
+++ b/devscripts/git-hooks/post-rewrite
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# post-rewrite hook that compiles python files to byte code
+
+python    -m compileall -q -x '\.tox/.+' . &&
+python -O -m compileall -q -x '\.tox/.+' .
+
+exit 0
diff --git a/devscripts/git-svn/SQLObject-gitignore/.gitignore b/devscripts/git-svn/SQLObject-gitignore/.gitignore
new file mode 100644
index 0000000..52d4a58
--- /dev/null
+++ b/devscripts/git-svn/SQLObject-gitignore/.gitignore
@@ -0,0 +1,10 @@
+*~
+*.tmp
+*.pyc
+*.pyo
+/MANIFEST
+/SQLObject.egg-info
+/build
+/data
+/dist
+/temp
diff --git a/devscripts/git-svn/SQLObject-gitignore/docs/.gitignore b/devscripts/git-svn/SQLObject-gitignore/docs/.gitignore
new file mode 100644
index 0000000..5937020
--- /dev/null
+++ b/devscripts/git-svn/SQLObject-gitignore/docs/.gitignore
@@ -0,0 +1,3 @@
+/*.html
+/data.db
+/html
diff --git a/devscripts/git-svn/svn2git b/devscripts/git-svn/svn2git
new file mode 100755
index 0000000..e93e4f6
--- /dev/null
+++ b/devscripts/git-svn/svn2git
@@ -0,0 +1,55 @@
+#! /bin/sh
+
+if [ -z "$1" ]; then
+   echo "Usage: $0 svn_url [dir]" >&2
+   exit 1
+fi
+
+url="$1"
+
+if [ ! -f authors.txt ]; then
+   echo "Run \"get-authors $1\" first" >&2
+   exit 2
+fi
+
+if [ -z "$2" ]; then
+   dir="`basename $url`"
+else
+   dir="$2"
+fi
+
+if [ -z "$dir" ]; then
+   echo "Usage: $0 $url dir" >&2
+   exit 1
+fi
+
+# init + fetch
+git svn clone "$url" --authors-file=authors.txt --prefix=svn/ --stdlayout "$dir" &&
+cd "$dir" &&
+
+# Convert tags and branches
+
+# See http://blog.jessitron.com/2013/08/converting-from-svn-to-git.html
+
+git for-each-ref --format="%(refname:short)" refs/remotes/svn |
+   sed 's#svn/##' | grep -v '^tags' |
+      while read aBranch; do git branch $aBranch svn/$aBranch || exit 1; done
+
+# See http://thomasrast.ch/git/git-svn-conversion.html
+
+git for-each-ref --format="%(refname:short)" refs/remotes/svn/tags/ |
+while read tag; do
+    GIT_COMMITTER_DATE="`git log -1 --pretty=format:\"%ad\" \"$tag\"`" \
+    GIT_COMMITTER_EMAIL="`git log -1 --pretty=format:\"%ce\" \"$tag\"`" \
+    GIT_COMMITTER_NAME="`git log -1 --pretty=format:\"%cn\" \"$tag\"`" \
+    git tag -a -m "`git for-each-ref --format=\"%(contents)\" \"$tag\"`" \
+        "`echo \"$tag\" | sed 's#svn/tags/##'`" "$tag" || exit 1
+done
+
+# preserve authors.txt
+cp -p ../authors.txt .git/info &&
+git config --local --path svn.authorsfile .git/info/authors.txt
+
+git svn gc &&
+git gc --aggressive &&
+echo "Cloned from $url using git-svn" >.git/description
diff --git a/devscripts/git-svn/svn2git-fullhistory b/devscripts/git-svn/svn2git-fullhistory
new file mode 100755
index 0000000..bc74b89
--- /dev/null
+++ b/devscripts/git-svn/svn2git-fullhistory
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+"`dirname \"$0\"`"/svn2git \
+   http://svn.colorstudy.com/SQLObject SQLObject-fullhistory &&
+
+git init --bare SQLObject.git &&
+cd SQLObject.git &&
+echo "Bare SQLObject repository" >description &&
+git fetch ../SQLObject-fullhistory master:master 1.5:1.5 1.6:1.6 1.7:1.7 tag 1.5.0b1 tag 1.5.0rc1 tag 1.5.0 tag 1.5.1 tag 1.5.2 tag 1.6.0a1 tag 1.6.0b1 tag 1.6.0 tag 1.7.0b1 &&
+
+cd .. &&
+git clone SQLObject.git SQLObject && rm -rf SQLObject.git &&
+cd SQLObject && git remote rm origin && rmdir .git/refs/remotes/origin &&
+
+echo "Development SQLObject repository" >.git/description &&
+git branch --track 1.5 origin/1.5 &&
+git branch --track 1.6 origin/1.6 &&
+git branch --track 1.7 origin/1.7 &&
+
+# Null merges
+git checkout 1.6 && git merge --no-commit -s ours 1.5 &&
+git checkout HEAD sqlobject/main.py && git commit &&
+
+git checkout 1.7 && git merge --no-commit -s ours 1.6 &&
+git checkout HEAD sqlobject/col.py && git commit &&
+
+git checkout master && git merge --no-commit -s ours 1.7 &&
+git checkout HEAD setup.cfg setup.py \
+   sqlobject/__version__.py sqlobject/converters.py \
+   sqlobject/tests/test_converters.py sqlobject/tests/test_datetime.py &&
+git commit &&
+
+exec vim .git/config
diff --git a/devscripts/null-merge b/devscripts/null-merge
new file mode 100755
index 0000000..036782b
--- /dev/null
+++ b/devscripts/null-merge
@@ -0,0 +1,54 @@
+#! /bin/sh
+
+new_branch=""
+old_branch=""
+
+while getopts n:o: opt; do
+   case $opt in
+      n ) new_branch="$OPTARG" ;;
+      o ) old_branch="$OPTARG" ;;
+   esac
+done
+shift `expr $OPTIND - 1`
+
+usage() {
+   echo "Usage: $0 [-o old_branch] [-n new_branch]|[old_branch new_branch]" >&2
+   exit 1
+}
+
+get_current_branch() {
+   current_branch="`git branch | grep '^\*' | awk '{print $2}'`"
+}
+
+if [ -n "$new_branch" ]; then
+   if [ -n "$old_branch" ]; then
... 670 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository