Skip to content

Commit

Permalink
Bumps for 3.16 releases
Browse files Browse the repository at this point in the history
Note python 2.6 also added
  • Loading branch information
rogerbinns committed Jan 5, 2017
1 parent a14d9a8 commit af7269d
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 40 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

SQLITEVERSION=3.15.2
SQLITEVERSION=3.16.1
APSWSUFFIX=-r1

RELEASEDATE="4 December 2016"
RELEASEDATE="10 January 2016"

VERSION=$(SQLITEVERSION)$(APSWSUFFIX)
VERDIR=apsw-$(VERSION)
Expand Down Expand Up @@ -128,6 +128,8 @@ compile-win:
cmd /c del /s /q build
cmd /c del /s /q apsw.egg-info
-cmd /c md dist
set APSW_FORCE_DISTUTILS=t & c:/python36/python setup.py $(WINBPREFIX) $(WINBSUFFIX) $(WINBINST)
set APSW_FORCE_DISTUTILS=t & "c:\program files (x86)\microsoft visual studio 14.0\vc\vcvarsall.bat" amd64 & c:/python36-64/python setup.py $(WINBPREFIX) $(WINBSUFFIX) $(WINBINST)
set APSW_FORCE_DISTUTILS=t & c:/python35/python setup.py $(WINBPREFIX) $(WINBSUFFIX) $(WINBINST)
set APSW_FORCE_DISTUTILS=t & "c:\program files (x86)\microsoft visual studio 14.0\vc\vcvarsall.bat" amd64 & c:/python35-64/python setup.py $(WINBPREFIX) $(WINBSUFFIX) $(WINBINST)
set APSW_FORCE_DISTUTILS=t & c:/python34/python setup.py $(WINBPREFIX) $(WINBSUFFIX) $(WINBINST)
Expand Down
5 changes: 5 additions & 0 deletions checksums
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,8 @@ https://sqlite.org/2016/sqlite-amalgamation-3150100.zip 1995316 f031263abcc73
https://sqlite.org/2016/sqlite-autoconf-3150100.tar.gz 2491350 47404fe5c43936160ad0e90bddedc99367da7a9b 0259d52be88f085d104c6d2aaa8349ac
https://sqlite.org/2016/sqlite-amalgamation-3150200.zip 1995634 9bbc9f8c003bcdf286dbf796aa8ddd392c7ac77a e1e342a487f459ed73da464ecb388543
https://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz 2491735 31f52169bcfeef9efb61480d0950e928ad059552 6b4fc0d8f7f02dd56bbde10a7c497a05

https://sqlite.org/2017/sqlite-amalgamation-3160100.zip 2011633 785beb8169e186701d7937e6b749cdc804d2ea49 9cfd6d7eb93ed7ce21446850d1f7ab86
https://sqlite.org/2017/sqlite-autoconf-3160100.tar.gz 2507441 77f8c59fec1575c5e05462dccac956f141677647 f02c51136a98bf211a9e27081294ac6d
https://sqlite.org/2017/sqlite-amalgamation-3160000.zip 2011189 c291793793d93aaa2993d48e062774dddd4fce1c 4c87d41c360a392cc54060b180ffd9b4
https://sqlite.org/2017/sqlite-autoconf-3160000.tar.gz 2506992 5150313c332b598a98be0c4bd5a04031a216ab13 1282b8ae301b5a7f43e301b9bdda0a67
7 changes: 7 additions & 0 deletions doc/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ Change History
**************
.. currentmodule:: apsw

next-r1
=======

Python 3.6 builds added.

Added SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE and SQLITE_FCNTL_PDB constants.

3.15.2-r1
=========

Expand Down
53 changes: 29 additions & 24 deletions doc/download.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,56 +24,61 @@ way to build or all the :ref:`options available <building>`.

.. downloads-begin
* `apsw-3.15.2-r1.zip
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.zip>`__
* `apsw-3.16.1-r1.zip
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.zip>`__
(Source, includes this HTML Help)

* Windows Python 2.3 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py2.3.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py2.3.exe>`__

* Windows Python 2.4 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py2.4.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py2.4.exe>`__

* Windows Python 2.5 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py2.5.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py2.5.exe>`__

* Windows Python 2.6 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py2.6.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py2.6.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py2.6.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py2.6.exe>`__

* Windows Python 2.7 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py2.7.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py2.7.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py2.7.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py2.7.exe>`__

* Windows Python 3.1 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py3.1.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.1.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py3.1.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.1.exe>`__

* Windows Python 3.2 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py3.2.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.2.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py3.2.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.2.exe>`__

* Windows Python 3.3 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py3.3.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.3.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py3.3.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.3.exe>`__

* Windows Python 3.4 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py3.4.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.4.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py3.4.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.4.exe>`__

* Windows Python 3.5 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win32-py3.5.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.5.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.win-amd64-py3.5.exe>`__
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.5.exe>`__

* `apsw-3.15.2-r1-sigs.zip
<https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1-sigs.zip>`__
* Windows Python 3.6 `32bit
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win32-py3.6.exe>`__
`64bit
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.win-amd64-py3.6.exe>`__

* `apsw-3.16.1-r1-sigs.zip
<https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1-sigs.zip>`__
GPG signatures for all files

.. downloads-end
Expand Down Expand Up @@ -116,7 +121,7 @@ Verify
To verify a file just use --verify specifying the corresponding
``.asc`` filename. This example verifies the source::

$ gpg --verify apsw-3.15.2-r1.zip.asc
$ gpg --verify apsw-3.16.1-r1.zip.asc
gpg: Signature made ... date ... using DSA key ID 0DFBD904
gpg: Good signature from "Roger Binns <rogerb@rogerbinns.com>"

Expand Down Expand Up @@ -176,8 +181,8 @@ official site, and builds/installs with all extensions enabled.
Use this (all one command)::

pip install --user https://github.com/rogerbinns/apsw/releases/download/3.15.2-r1/apsw-3.15.2-r1.zip \
--global-option=fetch --global-option=--version --global-option=3.15.2 --global-option=--all \
pip install --user https://github.com/rogerbinns/apsw/releases/download/3.16.1-r1/apsw-3.16.1-r1.zip \
--global-option=fetch --global-option=--version --global-option=3.16.1 --global-option=--all \
--global-option=build --global-option=--enable-all-extensions

.. pip-end
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ APSW documentation

.. centered:: APSW |version| released |today|

Use with SQLite 3.15 or later, CPython 2.3 or later including CPython
Use with SQLite 3.16 or later, CPython 2.3 or later including CPython
3.

APSW provides an SQLite 3 wrapper that provides the thinnest layer
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ def fixup_download_url(url):
if ver:
ver=int(ver.group(0))
if ver>=3071600:
if ver>=3100000:
if ver>=3160000:
year="2017"
elif ver>=3100000:
year="2016"
elif ver>=3080800:
year="2015"
Expand Down
8 changes: 4 additions & 4 deletions src/apsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ API Reference
#include "sqlite3.h"
#endif

#if SQLITE_VERSION_NUMBER < 3015000
#error Your SQLite version is too old. It must be at least 3.15
#if SQLITE_VERSION_NUMBER < 3016000
#error Your SQLite version is too old. It must be at least 3.16
#endif

/* system headers */
Expand Down Expand Up @@ -1594,6 +1594,7 @@ modules etc. For example::
ADDINT(SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER),
ADDINT(SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION),
ADDINT(SQLITE_DBCONFIG_MAINDBNAME),
ADDINT(SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE),
END,

DICT("mapping_status"),
Expand Down Expand Up @@ -1697,9 +1698,8 @@ modules etc. For example::
ADDINT(SQLITE_FCNTL_ZIPVFS),
ADDINT(SQLITE_FCNTL_JOURNAL_POINTER),
ADDINT(SQLITE_FCNTL_VFS_POINTER),
#ifdef SQLITE_FCNTL_WIN32_GET_HANDLE
ADDINT(SQLITE_FCNTL_WIN32_GET_HANDLE),
#endif
ADDINT(SQLITE_FCNTL_PDB),
END,

DICT("mapping_conflict_resolution_modes"),
Expand Down
2 changes: 1 addition & 1 deletion src/apswversion.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define APSW_VERSION "3.15.2-r1"
#define APSW_VERSION "3.16.1-r1"
6 changes: 5 additions & 1 deletion tools/checksums.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import re

sqlitevers=(
'3160100',
'3160000',
'3150200',
'3150100',
'3150000',
Expand Down Expand Up @@ -111,7 +113,9 @@ def fixup_download_url(url):
if ver:
ver=int(ver.group(0))
if ver>=3071600:
if ver>=3100000:
if ver>=3160000:
year="2017"
elif ver>=3100000:
year="2016"
elif ver>=3080800:
year="2015"
Expand Down
2 changes: 1 addition & 1 deletion tools/docupdate.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
op.append(" (Source, includes this HTML Help)")
op.append("")
not64=("2.3", "2.4", "2.5")
for pyver in ("2.3", "2.4", "2.5", "2.6", "2.7", "3.1", "3.2", "3.3", "3.4", "3.5",):
for pyver in ("2.3", "2.4", "2.5", "2.6", "2.7", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"):
op.append("* Windows Python %s `32bit" % (pyver,))
op.append(url % ("apsw-%s.win32-py%s.exe" % (version, pyver)))
if pyver not in not64:
Expand Down
10 changes: 5 additions & 5 deletions tools/megatest.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,13 @@ def patch_natty_build(setup):

# Default versions we support
PYVERS=(
'3.6.0',
'3.5.2',
'3.4.2',
'3.4.5',
'3.3.6',
'3.2.6',
'3.1.5',
'2.7.12',
'2.7.13',
'2.6.9',
'2.5.6',
'2.4.6',
Expand All @@ -199,9 +200,8 @@ def patch_natty_build(setup):
)

SQLITEVERS=(
'3.15.0',
'3.15.1',
'3.15.2',
'3.16.0',
'3.16.1',
)

if __name__=='__main__':
Expand Down

0 comments on commit af7269d

Please sign in to comment.