Skip to content

New scripts/requirements-lax.txt with '>=' instead of '=='#231

Merged
lgirdwood merged 2 commits intothesofproject:masterfrom
marc-hb:reqs-lax
Apr 19, 2020
Merged

New scripts/requirements-lax.txt with '>=' instead of '=='#231
lgirdwood merged 2 commits intothesofproject:masterfrom
marc-hb:reqs-lax

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Apr 17, 2020

Avoids hardcoding and virtualenvs.

See problem statement and discussion in PR #198 and extensive comments
in the new file itself.

Successfully tested with stock, "apt" versions on Ubuntu 18.04 LTS and
a totally empty 'pip3 list --local'

Signed-off-by: Marc Herbert marc.herbert@intel.com

marc-hb added 2 commits April 17, 2020 00:23
This reverts and replaces commit 26d3862 that replaced the "m4"
Pygment formatter by no code-block:: argument at all.

The argument was not optional in Sphinx versions before 2.0 and they
produce this giant warning that includes the entire code-block. Use
simple, no-op Pygment "text" instead.

sof-docs/algos/demux/demux.rst:62: WARNING: Error in "code-block"
   directive: 1 argument(s) required, 0 supplied.

.. code-block::

                # pipeline_id, channels, matrix_rows
                define(matrix1, `ROUTE_MATRIX(PIPELINE_ID, 2,
                          `BITS_TO_BYTE(1, 0, 0 ,0 ,0 ,0 ,0 ,0)',
                          `BITS_TO_BYTE(0, 1, 0 ,0 ,0 ,0 ,0 ,0)',
    etc.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Avoids hardcoding and virtualenvs.

See problem statement and discussion in PR thesofproject#198 and extensive comments
in the new file itself.

Successfully tested with stock, "apt" versions on Ubuntu 18.04 LTS and
a totally empty 'pip3 list --local'

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
Copy link
Collaborator Author

marc-hb commented Apr 17, 2020

I also have a .travis.yml proof of concept with two jobs that successfully builds from both requirements.txt and from this new requirements-lax.txt - but one thing at a time.

Cc: @dbkinder , @mbolivar

2 routing matrices and a demux component:

.. code-block::
.. code-block:: text
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another good option for these is ..code-block:: none

Copy link
Collaborator

@intelkevinputnam intelkevinputnam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lgirdwood lgirdwood merged commit e987dcf into thesofproject:master Apr 19, 2020
@marc-hb marc-hb deleted the reqs-lax branch April 22, 2020 03:16
@marc-hb
Copy link
Collaborator Author

marc-hb commented Apr 22, 2020

I also have a .travis.yml proof of concept with two jobs that successfully builds from both requirements.txt and from this new requirements-lax.txt

Cleaned up and submitted in PR #237

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants