summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2014-02-06 04:42:49 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2014-02-06 04:55:59 -0500
commit6de24d568df8f29fe5eabb637f8fb7a2989f9450 (patch)
treee20a58b568f0760558c610e1a81498dc9674446a
parenta6a9992ec1f9dee8b4deb0af64b594aa48c58755 (diff)
downloadpycurl-6de24d568df8f29fe5eabb637f8fb7a2989f9450.tar.gz
Preparing 7.19.3.1 release
-rw-r--r--ChangeLog4
-rw-r--r--MANIFEST.in2
-rw-r--r--RELEASE-NOTES.rst7
-rw-r--r--doc/release-process.rst4
-rw-r--r--setup.py5
-rw-r--r--winbuild.py2
-rw-r--r--www/htdocs/index.php4
7 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 1865d7c..ee89790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-master
-------
+Version 7.19.3.1 [requires libcurl-7.19.0 or better] - 2014-02-05
+-----------------------------------------------------------------
* Added --avoid-stdio setup.py option to avoid passing FILE
pointers from Python to libcurl. Applies to Python 2 only.
diff --git a/MANIFEST.in b/MANIFEST.in
index 648421f..24031e1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,7 @@
# Manifest template for creating the source distribution.
#
+include AUTHORS
include COPYING-LGPL
include COPYING-MIT
include ChangeLog
@@ -22,6 +23,7 @@ include tests/*.py
include tests/certs/*.crt
include tests/certs/*.key
include tests/ext/*.sh
+include tests/fake-curl/*
include tests/matrix/*.patch
include tests/vsftpd.conf
include winbuild.py
diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst
index c89466c..7fdd74b 100644
--- a/RELEASE-NOTES.rst
+++ b/RELEASE-NOTES.rst
@@ -1,6 +1,13 @@
Release Notes
=============
+PycURL 7.19.3.1 - 2014-02-05
+----------------------------
+
+This release restores PycURL's ability to automatically detect SSL library
+in use in most circumstances, thanks to Andjelko Horvat.
+
+
PycURL 7.19.3 - 2014-01-09
--------------------------
diff --git a/doc/release-process.rst b/doc/release-process.rst
index d8b4036..db8260e 100644
--- a/doc/release-process.rst
+++ b/doc/release-process.rst
@@ -11,9 +11,9 @@ Release Process
- Changelog
- setup.py
- winbuild.py
- - www/htdocs/index.php
+ - www/htdocs/index.php (also update release date)
6. Copy Changelog to www/htdocs.
-7. Draft release notes.
+7. Draft release notes, add to RELEASE-NOTES.rst.
8. ``make docs``.
9. ``python setup.py sdist``.
10. Manually test install the built package.
diff --git a/setup.py b/setup.py
index 18ff8bf..d35f151 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
PACKAGE = "pycurl"
PY_PACKAGE = "curl"
-VERSION = "7.19.3"
+VERSION = "7.19.3.1"
import glob, os, re, sys, string, subprocess
import distutils
@@ -396,7 +396,8 @@ def get_data_files():
else:
datadir = os.path.join("share", "doc", PACKAGE)
#
- files = ["ChangeLog", "COPYING-LGPL", "COPYING-MIT", "INSTALL.rst", "README.rst"]
+ files = ["AUTHORS", "ChangeLog", "COPYING-LGPL", "COPYING-MIT",
+ "INSTALL.rst", "README.rst"]
if files:
data_files.append((os.path.join(datadir), files))
files = glob.glob(os.path.join("doc", "*.rst"))
diff --git a/winbuild.py b/winbuild.py
index b5eefe7..7c41bf5 100644
--- a/winbuild.py
+++ b/winbuild.py
@@ -19,7 +19,7 @@ zlib_version = '1.2.8'
# which version of libcurl to use, will be downloaded from the internet
libcurl_version = '7.35.0'
# pycurl version to build, we should know this ourselves
-pycurl_version = '7.19.3'
+pycurl_version = '7.19.3.1'
import os, os.path, sys, subprocess, shutil, contextlib
diff --git a/www/htdocs/index.php b/www/htdocs/index.php
index 14fa86e..bca8e18 100644
--- a/www/htdocs/index.php
+++ b/www/htdocs/index.php
@@ -1,7 +1,7 @@
<?php // vi:ts=4:et
echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
-$version = "7.19.3";
-$version_date = "Jan 09 2014"
+$version = "7.19.3.1";
+$version_date = "Feb 05 2014"
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"