From 991d2317b3d936fdf760acc2519d9eefe211c232 Mon Sep 17 00:00:00 2001 From: Einar Forselv Date: Sat, 14 Oct 2023 01:23:53 +0200 Subject: [PATCH] Bump version + update build procedure --- CHANGELOG.md | 5 +++++ docs/conf.py | 2 +- extras/release.md | 25 +++++++------------------ moderngl_window/__init__.py | 2 +- pyproject.toml | 3 ++- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7108d65..b1863e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.4.5 + +* Reorganized the project using pyproject.toml +* Upgraded docs dependencies + ## 2.4.4 * Added `--backend` option to specify context backend. diff --git a/docs/conf.py b/docs/conf.py index 62d52ed..5d5b2c4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ def __getattr__(cls, name): author = 'Einar Forselv' # The short X.Y version -version = '2.4.4' +version = '2.4.5' # The full version, including alpha/beta/rc tags release = version diff --git a/extras/release.md b/extras/release.md index 60f7b0f..ce16d86 100644 --- a/extras/release.md +++ b/extras/release.md @@ -1,10 +1,8 @@ # Making a release -A reminder how to correctly create a release. -Ensuring all steps are followed will greatly increase -the chance of a successful release. -It's easy to forget one small thing ending up generating +A reminder how to correctly create a release. Ensuring all steps are followed will greatly increase +the chance of a successful release. It's easy to forget one small thing ending up generating more work. Let's try to avoid that! ## Version Numbers @@ -16,20 +14,11 @@ We try to follow semantic versioning as much as possible: https://semver.org/spe * Update `CHANGELOG.md` * Change version number in `moderngl_window.__version__` * Change version numbers in docs/conf.py (`version` and `release`) -* Change version in `setup.py` -* `rm -rf .tox` (Force env recreation) -* Run tests. Ensure it passes for `py38`, `py39`, `py310`, `py311` and `pep8`. - Run using `tox`. +* Change version in `pyproject.toml` +* Run `pytest` locally and also verify tests have passed in github actions * Create release on Github : https://github.com/moderngl/moderngl-window/releases with entries from `CHANGELOG.md` -* `python setup.py bdist_wheel` -* `python setup.py sdist` -* `twine upload dist/moderngl-window--py3-none-any.whl` -* `twine upload dist/moderngl-window-.tar.gz` + * `python -m build . --wheel --sdist --outdir dist/` + * `twine upload dist/moderngl-window--py3-none-any.whl` + * `twine upload dist/moderngl-window-.tar.gz` * Ensure docs are updated : https://moderngl-window.readthedocs.io/ * Ensure things look correct on PyPI : https://pypi.org/project/moderngl-window/ - -## Notes - -The advantage of using `tox` is that the package is properly built -and installed in each python environment. This eliminates many common -issues related to package management. diff --git a/moderngl_window/__init__.py b/moderngl_window/__init__.py index 3c3c5d4..0cdf367 100644 --- a/moderngl_window/__init__.py +++ b/moderngl_window/__init__.py @@ -18,7 +18,7 @@ from moderngl_window.utils.module_loading import import_string from moderngl_window.utils.keymaps import KeyMapFactory, KeyMap, QWERTY, AZERTY # noqa -__version__ = "2.4.4" +__version__ = "2.4.5" IGNORE_DIRS = [ "__pycache__", diff --git a/pyproject.toml b/pyproject.toml index 7e44814..c1a1b69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "moderngl-window" -version = "2.4.4" +version = "2.4.5" description = "A cross platform helper library for ModernGL making window creation and resource loading simple" readme = "README.md" authors = [ @@ -42,6 +42,7 @@ dev = [ "pywavefront", "trimesh", "scipy", + "build", ] docs = [ "Sphinx~=7.2.6 ",