Skip to content
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.

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

Rename PIL.version to PIL._version and remove it from module #3083

Merged
merged 1 commit into from
Apr 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Released quarterly on the first day of January, April, July, October.
* [ ] Develop and prepare release in ``master`` branch.
* [ ] Check [Travis CI](https://travis-ci.org/python-pillow/Pillow) and [AppVeyor CI](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in ``master`` branch.
* [ ] Check that all of the wheel builds [Pillow Wheel Builder](https://github.com/python-pillow/pillow-wheels) pass the tests in TravisCI.
* [ ] In compliance with https://www.python.org/dev/peps/pep-0440/, update version identifier in `PIL/version.py`
* [ ] In compliance with https://www.python.org/dev/peps/pep-0440/, update version identifier in `src/PIL/_version.py`
* [ ] Update `CHANGES.rst`.
* [ ] Run pre-release check via `make release-test` in a freshly cloned repo.
* [ ] Create branch and tag for release e.g.:
Expand Down Expand Up @@ -38,7 +38,7 @@ Released as needed for security, installation or critical bug fixes.
```
git checkout -t remotes/origin/2.9.x
```
* [ ] In compliance with https://www.python.org/dev/peps/pep-0440/, update version identifier in `PIL/version.py`
* [ ] In compliance with https://www.python.org/dev/peps/pep-0440/, update version identifier in `src/PIL/_version.py`
* [ ] Run pre-release check via `make release-test`.
* [ ] Create tag for release e.g.:
```
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def _read(file):


def get_version():
version_file = 'src/PIL/version.py'
version_file = 'src/PIL/_version.py'
with open(version_file, 'r') as f:
exec(compile(f.read(), version_file, 'exec'))
return locals()['__version__']
Expand Down
6 changes: 3 additions & 3 deletions src/PIL/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

# ;-)

from . import version
from . import _version

VERSION = '1.1.7' # PIL Version
PILLOW_VERSION = version.__version__
PILLOW_VERSION = __version__ = _version.__version__

__version__ = PILLOW_VERSION
del _version

_plugins = ['BlpImagePlugin',
'BmpImagePlugin',
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/version.py → src/PIL/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Master version for Pillow
__version__ = '5.1.0'
__version__ = '5.2.0.dev0'