Skip to content

Commit

Permalink
Merge #3300 #3303
Browse files Browse the repository at this point in the history
3300: List Python3 dependencies r=fweik a=jngrad

Follow-up to #3093

List the minimal version numbers that are supported for dependent Python modules.

Please note `requirements.txt` does not have to list strict dependencies, optional packages are also allowed. Comments after a package name must have a whitespace before the `#` symbol.

3303: utils: Fixed false positive compiler warnings occuring for some combi… r=jngrad a=fweik

…nations of gcc and boost



Co-authored-by: Jean-Noël Grad <[email protected]>
Co-authored-by: Florian Weik <[email protected]>
  • Loading branch information
3 people authored Nov 13, 2019
3 parents d700908 + a3b9187 + 9be9bac commit ef37a15
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 25 deletions.
16 changes: 5 additions & 11 deletions doc/sphinx/README.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
How to get started with SPHINX
==============================

#. Install the latest stable sphinx version via pip:
#. Install the latest stable sphinx version and the bibtex extension via pip:

.. code-block:: bash
.. code-block:: bash
pip2 install git+https://github.com/sphinx-doc/sphinx@stable --user --upgrade
#. Install a bibtex extension to Sphinx:

.. code-block:: bash
pip2 install sphinxcontrib-bibtex --user --upgrade
pip3 install --user --upgrade 'sphinx>=1.6.6,!=2.1.0' 'sphinxcontrib-bibtex>=0.3.5'
#. Compile the ``sphinx`` target in your build directory (that can take some time
since we depend on finishing the build of the interface):

.. code-block:: bash
.. code-block:: bash
make sphinx
make sphinx
#. In the directory :file:`doc/sphinx` you can find all the source rst files for the user guide.
You can change those files and rerun ``make sphinx``.
Expand Down
28 changes: 17 additions & 11 deletions doc/sphinx/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,26 @@ Required Development Tools
distributed versioning control system git_ and a GitHub account to fork the
`espressomd/espresso <https://github.com/espressomd/espresso>`_ repository

- To build the sphinx documentation, you will need the Python packages listed
in :file:`requirements.txt` in the top-level source directory. To install
them, use:
- To build the user documentation, you will need Sphinx_.

.. code-block:: bash
- To build the tutorials, you will need LaTeX and Jupyter.

pip install --upgrade --user -r requirements.txt
- To build the core documentation, you will need Doxygen_.

Note that some distributions now use ``pip`` for Python3 and ``pip2`` for
Python2.
All of these tools should be easy to install on most Unix operating systems.

- To build the tutorials, you will need LaTeX and Jupyter.
You can find all Python dependencies of |es| in :file:`requirements.txt` in the
top-level source directory. Several optional packages for graphics, external
devices and continuous integration (CI) are not strictly essential and can be
safely removed if you're planning on installing dependencies via ``pip``:

- To compile the Doxygen code documentation, you will need the tool doxygen_.
.. code-block:: bash
pip3 install --upgrade --user -r requirements.txt
Note that some distributions now use ``pip3`` for Python3 and ``pip2`` for
Python2.

All of these tools should be easy to install on most Unix operating systems.

.. _Building the User's guide:

Expand All @@ -117,4 +121,6 @@ in :ref:`Installation` and then the documentation with ``make sphinx``.

.. _git: http://git-scm.com/

.. _doxygen: http://www.doxygen.org/
.. _Doxygen: http://www.doxygen.org/

.. _Sphinx: https://www.sphinx-doc.org/en/master/
24 changes: 22 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
sphinx>=1.6.6,!=2.1.0
sphinxcontrib-bibtex>=0.3.5
# required scientific packages
numpy>=1.11.0
h5py>=2.6.0
# optional scientific packages
scipy>=0.17.0
MDAnalysis>=0.16
pint>=0.9
# optional packages for graphics and external devices
matplotlib>=1.5.1
vtk>=7.1.1
PyOpenGL>=3.1.0
mayavi>=4.5.0
pyface
pygame>=1.9.6
traits>=4.6.0
traitsui>=4.5.1
# CI-related
requests>=2.9.1 # to post on GitHub as espresso-ci
lxml>=3.5.0 # to deploy tutorials
# sphinx and its dependencies
sphinx>=1.6.6,!=2.1.0
sphinxcontrib-bibtex>=0.3.5
# pep8 and its dependencies
autopep8==1.3.4
pycodestyle==2.3.1
# pylint and its dependencies
pylint>=2.2.2
astroid>=2.1.0
isort>=4.3.4
2 changes: 1 addition & 1 deletion src/utils/tests/memcpy_archive_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE(serializaton_processing) {

{
auto ia = Utils::MemcpyIArchive{Utils::make_span(buf)};
OpVec out1, out2;
OpVec out1 = Utils::Vector3d{}, out2;
ia >> out1;
ia >> out2;

Expand Down

0 comments on commit ef37a15

Please sign in to comment.