diff --git a/RELEASING.md b/RELEASING.md index b013d8288..baf064f3a 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -11,7 +11,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Develop and prepare release in `main` branch. * [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `main` branch. * [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them. -* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py` +* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/__init__.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.: @@ -23,7 +23,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions) * [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) * [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), - increment and append `.dev0` to version identifier in `src/PIL/_version.py` and then: + increment and append `.dev0` to version identifier in `src/PIL/__init__.py` and then: ```bash git push --all ``` @@ -39,7 +39,7 @@ Released as needed for security, installation or critical bug fixes. ``` * [ ] Cherry pick individual commits from `main` branch to release branch e.g. `5.2.x`, then `git push`. * [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in release branch e.g. `5.2.x`. -* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py` +* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/__init__.py` * [ ] Run pre-release check via `make release-test`. * [ ] Create tag for release e.g.: ```bash diff --git a/setup.py b/setup.py index ce8f989ab..122ac3485 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext def get_version(): - version_file = "src/PIL/_version.py" + version_file = "src/PIL/__init__.py" with open(version_file, encoding="utf-8") as f: exec(compile(f.read(), version_file, "exec")) return locals()["__version__"] diff --git a/src/PIL/__init__.py b/src/PIL/__init__.py index 63a45769b..e8e0f492f 100644 --- a/src/PIL/__init__.py +++ b/src/PIL/__init__.py @@ -15,13 +15,10 @@ Use PIL.__version__ for this Pillow version. from __future__ import annotations -from . import _version - # VERSION was removed in Pillow 6.0.0. # PILLOW_VERSION was removed in Pillow 9.0.0. # Use __version__ instead. -__version__ = _version.__version__ -del _version +__version__ = "10.3.0.dev0" _plugins = [ diff --git a/src/PIL/_version.py b/src/PIL/_version.py deleted file mode 100644 index 0568943b5..000000000 --- a/src/PIL/_version.py +++ /dev/null @@ -1,4 +0,0 @@ -# Master version for Pillow -from __future__ import annotations - -__version__ = "10.3.0.dev0"