Skip to content

Commit

Permalink
Provide ldap3 2.1.1 for trusty and xenial
Browse files Browse the repository at this point in the history
We added both packages to the privacyidea-dev repository.

Closes privacyidea#588
  • Loading branch information
cornelinux committed Jan 8, 2017
1 parent 51818b2 commit 12aa1a0
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ info:
@echo "make ppa - upload to launchpad stable repo"

#VERSION=1.3~dev5
SHORT_VERSION=2.17
SHORT_VERSION=2.18~dev0
#SHORT_VERSION=2.10~dev7
VERSION_JESSIE=${SHORT_VERSION}
VERSION=${SHORT_VERSION}
Expand Down
4 changes: 2 additions & 2 deletions contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ VERSION2=1.3.0
URL2=https://pypi.python.org/packages/source/P/PyJWT/PyJWT-$(VERSION2).tar.gz

CONTRIB3=python-ldap3
VERSION3=2.1.0
URL3=https://pypi.python.org/packages/44/53/b458da2329ad57fa0044717cace2fa901ea6999bc141e6d65245f77e4eb8/ldap3-$(VERSION3).tar.gz
VERSION3=2.1.1
URL3=https://pypi.python.org/packages/f8/15/f8a33118b8e909e3953e5d9db6459693754ea42ae2aa481f4cab12e68c67/ldap3-$(VERSION3).tar.gz

CONTRIB4=python-flask-sqlalchemy
VERSION4=2.0
Expand Down
22 changes: 21 additions & 1 deletion contrib/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,22 @@
This folder contains the build environment for python modules that are not
shipped with Ubuntu 14.04LTS.
shipped with Ubuntu 14.04LTS or 16.04LTS.

Building ldap3
==============

To build for trusty:

make ldap3 series=trusty

Upload:

make ppa-dev series=trusty


To build for xenial:

make ldap3 series=xenial

Upload:

make ppa-dev series=xenial
6 changes: 6 additions & 0 deletions deploy/debian-ubuntu/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
python-privacyidea (2.18~dev0-1trusty) trusty; urgency=low

* Move to ldap3 version 2.1.1

-- Cornelius Kölbel <[email protected]> Sun, 08 Jan 2017 21:00:00 +0200

python-privacyidea (2.17-1trusty) trusty; urgency=low

Features
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys

#VERSION="2.1dev4"
VERSION="2.17"
VERSION="2.18dev0"

# Taken from kennethreitz/requests/setup.py
package_directory = os.path.realpath(os.path.dirname(__file__))
Expand Down

0 comments on commit 12aa1a0

Please sign in to comment.