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

Env variable for faster Python imports (#1175) #1388

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Get rid of six package in docs and setup.py
dbogdanov committed Dec 13, 2023
commit 3ae0e0e9818fff2a631e586f77a887ffa00f183f
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential libeigen3-dev libyaml-dev libfftw3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libsamplerate0-dev libtag1-dev libchromaprint-dev python3-dev python3-numpy-dev python3-numpy python3-yaml python3-six
sudo apt-get install -y build-essential libeigen3-dev libyaml-dev libfftw3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libsamplerate0-dev libtag1-dev libchromaprint-dev python3-dev python3-numpy-dev python3-numpy python3-yaml
sudo apt-get install -y doxygen python3-pip pandoc
pip3 install sphinx pyparsing sphinxcontrib-doxylink docutils jupyter sphinxprettysearchresults sphinx-toolbox
# Install TensorFlow
2 changes: 1 addition & 1 deletion doc/sphinxdoc/installing.rst
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ You can install those dependencies on a Debian/Ubuntu system from official repos

In order to use Python 3 bindings for the library, you might also need to install python3-dev, python3-numpy-dev (or python3-numpy on Ubuntu) and python3-yaml for YAML support in python::

sudo apt-get install python3-dev python3-numpy-dev python3-numpy python3-yaml python3-six
sudo apt-get install python3-dev python3-numpy-dev python3-numpy python3-yaml

Note that, depending on the version of Essentia, different versions of ``libav*`` and ``libtag1-dev`` packages are required. See `release notes for official releases <https://github.com/MTG/essentia/releases>`_.

2 changes: 1 addition & 1 deletion doc/sphinxdoc/machine_learning.rst
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ Install the `dependencies <https://essentia.upf.edu/installing.html#installing-d

.. code-block::

apt-get install build-essential libyaml-dev libfftw3-dev libavcodec-dev libavformat-dev libavutil-dev libavresample-dev python-dev libsamplerate0-dev libtag1-dev libchromaprint-dev python-six python3-dev python3-numpy-dev python3-numpy python3-yaml libeigen3-dev
apt-get install build-essential libyaml-dev libfftw3-dev libavcodec-dev libavformat-dev libavutil-dev libavresample-dev python-dev libsamplerate0-dev libtag1-dev libchromaprint-dev python3-dev python3-numpy-dev python3-numpy python3-yaml libeigen3-dev

Configure Essentia with TensorFlow and Python 3:

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ def get_version():
Website: https://essentia.upf.edu
'''

setup_requires = ['numpy>=1.8.2', 'six']
setup_requires = ['numpy>=1.8.2']
install_requires = setup_requires + ['pyyaml']

# Require tensorflow for the package essentia-tensorflow