Skip to content

Commit af25e14

Browse files
committed
Bump version and move setup.py to pyproject.toml
1 parent 30b8085 commit af25e14

File tree

7 files changed

+64
-48
lines changed

7 files changed

+64
-48
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ If you use our models, please cite the following papers:
116116

117117
## License
118118

119-
The code of EmotiEffLib Python Library is released under the Apache-2.0 License. There is no limitation for both academic and commercial usage.
119+
The code of EmotiEffLib is released under the Apache-2.0 License. There is no limitation for both academic and commercial usage.

emotieffcpplib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.10.2)
2-
project("emotiefflib" VERSION 1.0)
2+
project("emotiefflib" VERSION 1.1.1)
33

44
set(CMAKE_CXX_STANDARD 17)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)

emotiefflib/README.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,29 @@ recognition in images and videos. It supports multiple inference engines,
55
including Torch and ONNX Runtime.
66

77
## Installing
8+
### Install version of the library from actual code
9+
- Install EmotiEffLib with ONNX support:
10+
```sh
11+
pip install .
12+
```
13+
- Install EmotiEffLib with ONNX and Torch support:
14+
```sh
15+
pip install .[torch]
16+
```
17+
- Install EmotiEffLib with ONNX and TensorFlow support (the last one is necessary for enagement prediction):
18+
```sh
19+
pip install .[engagement]
20+
```
21+
- Install EmotiEffLib with all possible dependencies:
22+
```sh
23+
pip install .[all]
24+
```
25+
or
26+
```sh
27+
pip install .[torch,engagement]
28+
```
829

9-
```
10-
python setup.py install
11-
```
12-
30+
### Install version of the library from PyPI
1331
It is also possible to install it via pip:
1432
- Install EmotiEffLib with ONNX support:
1533
```sh
@@ -56,4 +74,4 @@ follow the following steps:
5674

5775
## License
5876

59-
The code of EmotiEffCppLib Library is released under the Apache-2.0 License. There is no limitation for both academic and commercial usage.
77+
The code of EmotiEffLib Python Library is released under the Apache-2.0 License. There is no limitation for both academic and commercial usage.

emotiefflib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Emotion Efficient Library module
33
"""
44

5-
__version__ = "1.0"
5+
__version__ = "1.1.1"

pyproject.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
[build-system]
2+
requires = ["setuptools>=61.0"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "emotiefflib"
7+
version = "1.1.1"
8+
description = "EmotiEffLib Python Library for Facial Emotion and Engagement Recognition"
9+
readme = "README.md"
10+
license = "Apache-2.0"
11+
license-files = ["LICEN[CS]E.*"]
12+
authors = [
13+
{ name = "Andrey Savchenko", email = "[email protected]" },
14+
{ name = "Egor Churaev", email = "[email protected]" }
15+
]
16+
keywords = [
17+
"face expression recognition",
18+
"emotion analysis",
19+
"facial expressions",
20+
"engagement detection",
21+
]
22+
dynamic = ["dependencies", "optional-dependencies"]
23+
24+
[project.urls]
25+
Homepage = "https://github.com/sb-ai-lab/EmotiEffLib"
26+
Download = "https://github.com/sb-ai-lab/EmotiEffLib/archive/v1.1.1.tar.gz"
27+
Repository = "https://github.com/sb-ai-lab/EmotiEffLib"
28+
Documentation = "https://sb-ai-lab.github.io/EmotiEffLib/"
29+
30+
[tool.setuptools]
31+
packages = { find = { where = ["."] } }
32+
33+
[tool.setuptools.dynamic]
34+
dependencies = { file = ["requirements.txt"] }
35+
optional-dependencies.torch = { file = ["requirements-torch.txt"] }
36+
optional-dependencies.engagement = { file = ["requirements-engagement.txt"] }
37+
optional-dependencies.all = { file = ["requirements-torch.txt", "requirements-engagement.txt"] }
38+
139
[tool.black]
240
line-length = 100
341
target-version = ['py310']

setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)