Skip to content

Commit

Permalink
Merge branch 'update-assimp'
Browse files Browse the repository at this point in the history
  • Loading branch information
flozz committed Jan 6, 2024
2 parents a1d5312 + 8ca8432 commit 9e28095
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 1,279 deletions.
1,240 changes: 1 addition & 1,239 deletions MANIFEST.in

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ Changelog

* **[NEXT]** (changes on ``master`` that have not been released yet):

* Nothing yet ;)
* feat(assimp): Updated assimp to v5.3.1
* chore: Removed a script that is no more needed
* docs: Updated contributing documentation (libraries, supported Python
version, assimp update)

* **v1.2.3:**

Expand Down
2 changes: 1 addition & 1 deletion assimp
Submodule assimp updated 1689 files
34 changes: 32 additions & 2 deletions doc/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,17 @@ Linux as operating system and a POSIX shell (like Bash or ZSH).

Programming languages used in this project:

* Python_ (2.7, 3.7, 3.8 and 3.9)
* Python_ (3.8 to 3.12)
* C++

Libraries:

* CFFI_: C/Python binding
* imagequant_: Color quantization (to reduce number of colors in an image)
* mozjpeg-lossless-optimization_: Lossless JPEG optimization
* Pillow_: Image processing library
* PyGuetzli_: JPEG optimization
* ZopfliPy_: PNG Optimization
* ZopfliPy_: PNG optimization

Development tools:

Expand Down Expand Up @@ -249,9 +251,37 @@ Then you can run the following command::
nox -s gendoc


Updating ASSIMP
---------------

ASSIMP is the C++ library used by YOGA to manipulate 3D models. To update it,
first check the latest version tag on the project's repo :

* https://github.com/assimp/assimp/tags

Then go to the assimp subfolder and checkout the latest release tag::

cd assimp/
git fetch
git checkout vX.Y.Z
cd ..

Then, run tests to ensure YOGA still work::

nox -s test

Finally, check we are still able to build a wheel from the sdist package::

nox -s test_build_wheel

If the build fails because of a missing file, add it in ``MANIFEST.in``.


.. _Python: https://www.python.org/

.. _CFFI: https://cffi.readthedocs.io/en/latest/
.. _imagequant: https://github.com/wanadev/imagequant-python
.. _mozjpeg-lossless-optimization: https://github.com/wanadev/mozjpeg-lossless-optimization
.. _Pillow: https://pillow.readthedocs.io/en/stable/
.. _PyGuetzli: https://github.com/wanadev/pyguetzli
.. _ZopfliPy: https://github.com/hattya/zopflipy
Expand Down
10 changes: 9 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"noxfile.py",
]

PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]


@nox.session(reuse_venv=True)
def lint(session):
Expand Down Expand Up @@ -42,13 +44,19 @@ def black_fix(session):
session.run("black", *PYTHON_FILES)


@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12"], reuse_venv=True)
@nox.session(python=PYTHON_VERSIONS, reuse_venv=True)
def test(session):
session.install("pytest")
session.install(".")
session.run("pytest", "-v", "test")


@nox.session(reuse_venv=False)
def test_build_wheel(session):
session.install("build")
session.run("python", "-m", "build")


@nox.session(reuse_venv=True)
def gendoc(session):
session.install("sphinx", "sphinx-rtd-theme")
Expand Down
35 changes: 0 additions & 35 deletions scripts/generate_manifest_in.sh

This file was deleted.

0 comments on commit 9e28095

Please sign in to comment.