Skip to content

RFC: Specify Version in one place #2517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 29, 2017
Merged

RFC: Specify Version in one place #2517

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8999ccb
single version for build
wiredfool Apr 19, 2017
4f1bab5
current version
wiredfool May 10, 2017
cdd2236
Restore PIL version
wiredfool May 10, 2017
67d6e00
py3x fixes
wiredfool May 10, 2017
edc8d86
Fix to ensure that define is interpreted as a string on windows
wiredfool Jun 21, 2017
45ed1a8
appveyor version -> simple build number
wiredfool Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions PIL/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

# ;-)

VERSION = '1.1.7' # PIL version
PILLOW_VERSION = '4.2.0.dev0' # Pillow
from . import version


PILLOW_VERSION = version.__version__

__version__ = PILLOW_VERSION

Expand Down
2 changes: 2 additions & 0 deletions PIL/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Master version for Pillow
__version__ = '4.2.0.dev0'
2 changes: 0 additions & 2 deletions _imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
* See the README file for information on usage and redistribution.
*/

#define PILLOW_VERSION "4.2.0.dev0"

#include "Python.h"

#ifdef HAVE_LIBZ
Expand Down
10 changes: 9 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,20 @@ def _read(file):
return fp.read()


def get_version():
version_file = 'PIL/version.py'
with open(version_file, 'ra') as f:
exec(compile(f.read(), version_file, 'exec'))
return locals()['__version__']

try:
import _tkinter
except (ImportError, OSError):
# pypy emits an oserror
_tkinter = None

NAME = 'Pillow'
PILLOW_VERSION = '4.2.0.dev0'
PILLOW_VERSION = get_version()
JPEG_ROOT = None
JPEG2K_ROOT = None
ZLIB_ROOT = None
Expand Down Expand Up @@ -578,6 +584,8 @@ def build_extensions(self):
if struct.unpack("h", "\0\1".encode('ascii'))[0] == 1:
defs.append(("WORDS_BIGENDIAN", None))

defs.append(("PILLOW_VERSION", '"%s"'%PILLOW_VERSION))

exts = [(Extension("PIL._imaging",
files,
libraries=libs,
Expand Down