Version bump

.gitignore

@@ -42,3 +42,4 @@ megatestresults/
 work/
 coverage/
 testdb
+/.coverage

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 Roger Binns <[email protected]>
+Copyright (c) 2004-2014 Roger Binns <[email protected]>
 See src/traceback.c for code by Greg Ewing.
 
 All code and documentation is provided under this license:

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)

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

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
 ========
 

doc/conf.py

@@ -48,7 +48,7 @@
 
 # General substitutions.
 project = u'APSW'
-copyright = u'2004-2013, Roger Binns <[email protected]>'
+copyright = u'2004-2014, Roger Binns <[email protected]>'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.

doc/download.rst

@@ -18,44 +18,44 @@ way to build or all the :ref:`options available <building>`.
 
 .. downloads-begin
 
-* `apsw-3.8.2-r1.zip
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.zip>`__
+* `apsw-3.8.3-r1.zip
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.zip>`__
   (Source, includes this HTML Help)
 
 * Windows Python 2.3 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py2.3.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py2.3.exe>`__
 
 * Windows Python 2.4 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py2.4.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py2.4.exe>`__
 
 * Windows Python 2.5 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py2.5.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py2.5.exe>`__
 
 * Windows Python 2.6 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py2.6.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py2.6.exe>`__
   `64bit 
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win-amd64-py2.6.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win-amd64-py2.6.exe>`__
 
 * Windows Python 2.7 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py2.7.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py2.7.exe>`__
   `64bit 
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win-amd64-py2.7.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win-amd64-py2.7.exe>`__
 
 * Windows Python 3.1 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py3.1.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py3.1.exe>`__
   `64bit 
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win-amd64-py3.1.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win-amd64-py3.1.exe>`__
 
 * Windows Python 3.2 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py3.2.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py3.2.exe>`__
   `64bit 
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win-amd64-py3.2.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win-amd64-py3.2.exe>`__
 
 * Windows Python 3.3 `32bit
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1.win32-py3.3.exe>`__
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/apsw-3.8.3-r1.win32-py3.3.exe>`__
 
-* `apsw-3.8.2-r1-sigs.zip 
-  <https://github.com/rogerbinns/apsw/releases/download/3.8.2-r1/apsw-3.8.2-r1-sigs.zip>`__
+* `apsw-3.8.3-r1-sigs.zip 
+  <https://github.com/rogerbinns/apsw/releases/download/3.8.3-r1/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 <[email protected]>"
 

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
 

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
 
       };

src/apswversion.h

@@ -1 +1 @@
-#define APSW_VERSION "3.8.2-r1"
+#define APSW_VERSION "3.8.3-r1"

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
 

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]),))

tools/megatest.py

@@ -179,7 +179,7 @@ def patch_natty_build(setup):
     )
 
 SQLITEVERS=(
-    '3.8.2',
+    '3.8.3',
    )
 
 if __name__=='__main__':