Skip to content

Commit

Permalink
Merge 05355d0 into dae6406
Browse files Browse the repository at this point in the history
  • Loading branch information
awicenec committed Sep 17, 2020
2 parents dae6406 + 05355d0 commit 9c87380
Show file tree
Hide file tree
Showing 181 changed files with 4,974 additions and 4,696 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ dist
.settings
.pytest_cache
.vscode
daliuge-runtime/dlg/runtime/version.py
daliuge-engine/dlg/runtime/version.py
daliuge-common/dlg/common/version.py
daliuge-translator/dlg/translator/version.py
daliuge-runtime/test/apps/libdynlib_example.so
daliuge-runtime/test/apps/dynlib_example.o
daliuge-runtime/test/apps/libdynlib_example2.so
daliuge-runtime/test/apps/dynlib_example2.o
daliuge-engine/test/apps/libdynlib_example.so
daliuge-engine/test/apps/dynlib_example.o
daliuge-engine/test/apps/libdynlib_example2.so
daliuge-engine/test/apps/dynlib_example2.o
.idea
daliuge.iml
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ before_install:
install:
- pip install -e daliuge-common/
- test -n "$NO_DLG_TRANSLATOR" || pip install -e daliuge-translator/
- test -n "$NO_DLG_RUNTIME" || pip install -e daliuge-runtime/
- test -n "$NO_DLG_RUNTIME" || pip install -e daliuge-engine/

# run the tests, making sure subprocesses generate coverage information
script:
- COVFILES=
- test -n "$NO_DLG_TRANSLATOR" || { (cd daliuge-translator && pip install -r test-requirements.txt && py.test --cov) && COVFILES+=" daliuge-translator/.coverage"; }
- test -n "$NO_DLG_RUNTIME" || { (cd daliuge-runtime && py.test --cov) && COVFILES+=" daliuge-runtime/.coverage"; }
- test -n "$NO_DLG_RUNTIME" || { (cd daliuge-engine && py.test --cov) && COVFILES+=" daliuge-engine/.coverage"; }
- coverage combine $COVFILES
- test -z "$TEST_OPENAPI" || (cd OpenAPI/tests && ./test_managers_openapi.sh)

Expand Down
46 changes: 2 additions & 44 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ It originated from a prototyping activity as part of the `SDP Consortium
<https://www.skatelescope.org/sdp/>`_ called Data Flow Management System (DFMS). DFMS aimed to
prototype the execution framework of the proposed SDP architecture.

For more information about the installation and usage of the system please refer to the docs or to https://daliuge.readthedocs.io


Development and maintenance of |daliuge| is currently hosted at ICRAR_
and is performed by the `DIA team <http://www.icrar.org/our-research/data-intensive-astronomy/>`_.
Expand All @@ -28,51 +30,7 @@ See the ``docs/`` directory for more information, or visit `our online
documentation <https://daliuge.readthedocs.io/>`_


Installation
------------

To get the latest stable version of the full package::

pip install daliuge

If you only want the translator engine and don't need the runtime,
or vice-versa, you can install them separately::

pip install daliuge-translator
pip install daliuge-runtime

.. You can also install each directly from GitHub::
..
.. pip install "git+https://github.com/ICRAR/daliuge#egg=daliuge-common&subdirectory=daliuge-common"
.. pip install "git+https://github.com/ICRAR/daliuge#egg=daliuge-translator&subdirectory=daliuge-translator"
.. pip install "git+https://github.com/ICRAR/daliuge#egg=daliuge-runtime&subdirectory=daliuge-runtime"
.. pip install "git+https://github.com/ICRAR/daliuge"
Or if you plan to develop |daliuge|::

git clone https://github.com/ICRAR/daliuge
cd daliuge
pip install -e daliuge-common
pip install -e daliuge-translator # optional
pip install -e daliuge-runtime # optional


Porting from |daliuge| 0.X
--------------------------

With the release of |daliuge| 1.0.0
the code has been broken down into separate packages
to accommodate leaner and easier installations
when only a subset of the functionality is required.
In doing so we tried to maintain
as much backward compatibility as possible,
but there are some minor exceptions:

* Code doing ``from dlg import delayed`` or similar must be changed
to ``from dlg.runtime import delayed``.
* Scripts finding the include directory path for daliuge headers
using code like ``python -c 'import dlg; print(dlg.get_include_dir())``
should switch to invoke ``dlg include_dir`` instead.


.. |daliuge| replace:: DALiuGE
Expand Down
53 changes: 0 additions & 53 deletions RELEASE.rst

This file was deleted.

Loading

0 comments on commit 9c87380

Please sign in to comment.