diff --git a/.gitignore b/.gitignore index 84d71d33..39331fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ megatestresults/ work/ coverage/ testdb +/.coverage diff --git a/LICENSE b/LICENSE index dbac5009..1643f7cb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2013 Roger Binns +Copyright (c) 2004-2014 Roger Binns See src/traceback.c for code by Greg Ewing. All code and documentation is provided under this license: diff --git a/Makefile b/Makefile index a759b51e..a1918d3d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -SQLITEVERSION=3.8.2 +SQLITEVERSION=3.8.3 APSWSUFFIX=-r1 -RELEASEDATE="8 December 2013" +RELEASEDATE="3 February 2014" VERSION=$(SQLITEVERSION)$(APSWSUFFIX) VERDIR=apsw-$(VERSION) diff --git a/checksums b/checksums index 6ddb1b32..3d5da022 100644 --- a/checksums +++ b/checksums @@ -101,3 +101,6 @@ https://sqlite.org/2013/sqlite-autoconf-3080100.tar.gz 1896869 42464b07df2d6f8aa https://sqlite.org/2013/sqlite-amalgamation-3080200.zip 1473300 c0559520d014802fe587977e8d773f350b7e35fe 9b5b7204436700a99d48c81bc0751e0c https://sqlite.org/2013/sqlite-autoconf-3080200.tar.gz 1917056 6033ef603ce221d367c665477514d972ef1dc90e f62206713e6a08d4ccbc60b1fd712a1a + +https://sqlite.org/2014/sqlite-amalgamation-3080300.zip 1479396 e45a696b740af4dcad66d66c4b5b50be81f6ee09 976371760eb3ca3b34015720d4443bf7 +https://sqlite.org/2014/sqlite-autoconf-3080300.tar.gz 1923594 c2a21d71d0c7dc3af71cf90f04dfd22ecfb280c2 11572878dc0ac74ae370367a464ab5cf diff --git a/doc/changes.rst b/doc/changes.rst index 7860e779..3cafb6b7 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -2,11 +2,15 @@ Change History ************** .. currentmodule:: apsw -next -==== +3.8.3-r1 +======== APSW is now hosted at Github - https://github.com/rogerbinns/apsw +Added SQLITE_RECURSIVE, SQLITE_READONLY_DBMOVED, +SQLITE_FCNTL_COMMIT_PHASETWO, SQLITE_FCNTL_HAS_MOVED and +SQLITE_FCNTL_SYNC constants. + 3.8.2-r1 ======== diff --git a/doc/conf.py b/doc/conf.py index 6fb4d689..8788db71 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ # General substitutions. project = u'APSW' -copyright = u'2004-2013, Roger Binns ' +copyright = u'2004-2014, Roger Binns ' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. diff --git a/doc/download.rst b/doc/download.rst index 9972f24f..30d4a7d6 100644 --- a/doc/download.rst +++ b/doc/download.rst @@ -18,44 +18,44 @@ way to build or all the :ref:`options available `. .. downloads-begin -* `apsw-3.8.2-r1.zip - `__ +* `apsw-3.8.3-r1.zip + `__ (Source, includes this HTML Help) * Windows Python 2.3 `32bit - `__ + `__ * Windows Python 2.4 `32bit - `__ + `__ * Windows Python 2.5 `32bit - `__ + `__ * Windows Python 2.6 `32bit - `__ + `__ `64bit - `__ + `__ * Windows Python 2.7 `32bit - `__ + `__ `64bit - `__ + `__ * Windows Python 3.1 `32bit - `__ + `__ `64bit - `__ + `__ * Windows Python 3.2 `32bit - `__ + `__ `64bit - `__ + `__ * Windows Python 3.3 `32bit - `__ + `__ -* `apsw-3.8.2-r1-sigs.zip - `__ +* `apsw-3.8.3-r1-sigs.zip + `__ GPG signatures for all files .. downloads-end @@ -98,7 +98,7 @@ Verify To verify a file just use --verify specifying the corresponding ``.asc`` filename. This example verifies the source:: - $ gpg --verify apsw-3.8.2-r1.zip.asc + $ gpg --verify apsw-3.8.3-r1.zip.asc gpg: Signature made ... date ... using DSA key ID 0DFBD904 gpg: Good signature from "Roger Binns " diff --git a/setup.py b/setup.py index 458a1248..f10efac7 100644 --- a/setup.py +++ b/setup.py @@ -69,9 +69,13 @@ def fixup_download_url(url): if ver: ver=int(ver.group(0)) if ver>=3071600: - if "/2013/" not in url: + if ver>=3080300: + year="2014" + else: + year="2013" + if "/"+year+"/" not in url: url=url.split("/") - url.insert(3, "2013") + url.insert(3, year) return "/".join(url) return url diff --git a/src/apsw.c b/src/apsw.c index bc308949..defa5290 100644 --- a/src/apsw.c +++ b/src/apsw.c @@ -58,8 +58,8 @@ API Reference #include "sqlite3.h" #endif -#if SQLITE_VERSION_NUMBER < 3008002 -#error Your SQLite version is too old. It must be at least 3.8.2 +#if SQLITE_VERSION_NUMBER < 3008003 +#error Your SQLite version is too old. It must be at least 3.8.3 #endif /* system headers */ @@ -1424,6 +1424,7 @@ modules etc. For example:: ADDINT(SQLITE_DROP_VTABLE), ADDINT(SQLITE_FUNCTION), ADDINT(SQLITE_SAVEPOINT), + ADDINT(SQLITE_RECURSIVE), END, /* vtable best index constraints */ @@ -1489,6 +1490,7 @@ modules etc. For example:: ADDINT(SQLITE_CANTOPEN_CONVPATH), ADDINT(SQLITE_IOERR_CONVPATH), ADDINT(SQLITE_CONSTRAINT_ROWID), + ADDINT(SQLITE_READONLY_DBMOVED), END, /* error codes */ @@ -1684,6 +1686,9 @@ modules etc. For example:: ADDINT(SQLITE_FCNTL_TEMPFILENAME), ADDINT(SQLITE_FCNTL_MMAP_SIZE), ADDINT(SQLITE_FCNTL_TRACE), + ADDINT(SQLITE_FCNTL_COMMIT_PHASETWO), + ADDINT(SQLITE_FCNTL_HAS_MOVED), + ADDINT(SQLITE_FCNTL_SYNC), END }; diff --git a/src/apswversion.h b/src/apswversion.h index 1880b0a5..57120f8c 100644 --- a/src/apswversion.h +++ b/src/apswversion.h @@ -1 +1 @@ -#define APSW_VERSION "3.8.2-r1" +#define APSW_VERSION "3.8.3-r1" diff --git a/tools/checksums.py b/tools/checksums.py index b32f0465..0093a6c2 100755 --- a/tools/checksums.py +++ b/tools/checksums.py @@ -7,6 +7,7 @@ import re sqlitevers=( + '3080300', '3080200', '3080100', '3080002', @@ -71,9 +72,13 @@ def fixup_download_url(url): if ver: ver=int(ver.group(0)) if ver>=3071600: - if "/2013/" not in url: + if ver>=3080300: + year="2014" + else: + year="2013" + if "/"+year+"/" not in url: url=url.split("/") - url.insert(3, "2013") + url.insert(3, year) return "/".join(url) return url diff --git a/tools/code2rst.py b/tools/code2rst.py index debfa406..9c4b4562 100644 --- a/tools/code2rst.py +++ b/tools/code2rst.py @@ -86,10 +86,13 @@ def do_mappings(): print " ",consts[val],"\t",val sys.exit(1) # check to see if apsw is missing any + shouldexit=False for v in pages[pg]['vars']: if v not in mappings[map]: print "Mapping",map,"is missing",v - sys.exit(1) + shouldexit=True + if shouldexit: + sys.exit(1) vals=m[:] vals.sort() op.append(" %s" % (", ".join([":const:`"+v+"`" for v in vals]),)) diff --git a/tools/megatest.py b/tools/megatest.py index ee2fc390..57927a52 100644 --- a/tools/megatest.py +++ b/tools/megatest.py @@ -179,7 +179,7 @@ def patch_natty_build(setup): ) SQLITEVERS=( - '3.8.2', + '3.8.3', ) if __name__=='__main__':