Skip to content

Commit

Permalink
Rename waves.core en waves.vcore (contentype less chance of crash)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Chjakiachvili committed Jul 13, 2017
1 parent 66e5150 commit 6903402
Show file tree
Hide file tree
Showing 215 changed files with 495 additions and 1,150 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ ENV/
!/waves/forms/lib/
/waves/tests/settings.ini
/staticfiles/
!/waves/core/forms/lib/
!/waves/wcore/forms/lib/
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import django

# from mock import Mock as MagicMock
import waves.core as waves
import waves.wcore as waves

"""
class Mock(MagicMock):
Expand Down
8 changes: 4 additions & 4 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ GET a WAVES web-app online following the next few steps, WAVES can run on Apache

1.3. Include the services urls in your project urls.py::

url(r'^waves/', include('waves.core.urls', namespace='waves')),
url(r'^waves/', include('waves.wcore.urls', namespace='waves')),

Alternativly you can use only parts waves urls configuration you need:

url(r'^admin/waves/', include('waves.core.urls.waves_admin_url', namespace='waves')),
url(r'^my-api/', include('waves.core.urls.waves_api_url', namespace='waves')),
url(r'^waves/', include('waves.core.urls.front_url', namespace='waves'))
url(r'^admin/waves/', include('waves.wcore.urls.waves_admin_url', namespace='waves')),
url(r'^my-api/', include('waves.wcore.urls.waves_api_url', namespace='waves')),
url(r'^waves/', include('waves.wcore.urls.front_url', namespace='waves'))

1.4. Run ``python manage.py makemigrations`` to update database models.

Expand Down
16 changes: 8 additions & 8 deletions docs/modules/adaptors/adaptors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@ These modules execute job on dedicated platforms, remotely or locally, they are

Constants
---------
.. automodule:: waves.core.adaptors.const
.. automodule:: waves.wcore.adaptors.const

Exceptions
----------
.. automodule:: waves.core.adaptors.exceptions
.. automodule:: waves.wcore.adaptors.exceptions

Adaptor Loader
--------------
.. automodule:: waves.core.adaptors.loader
.. automodule:: waves.wcore.adaptors.loader

Utilities classes
-----------------
.. automodule:: waves.core.adaptors.utils
.. automodule:: waves.wcore.adaptors.utils

Adaptor base class
------------------
.. automodule:: waves.core.adaptors.adaptor
.. automodule:: waves.wcore.adaptors.adaptor
:members:
:show-inheritance:

Shell script related adaptors class
-----------------------------------
.. automodule:: waves.core.adaptors.shell
.. automodule:: waves.wcore.adaptors.shell
:members:
:show-inheritance:

Api related adaptor base class
------------------------------
.. automodule:: waves.core.adaptors.api
.. automodule:: waves.wcore.adaptors.api
:members:
:show-inheritance:

Cluster related adaptors
------------------------
.. automodule:: waves.core.adaptors.cluster
.. automodule:: waves.wcore.adaptors.cluster
:members:
:show-inheritance:
4 changes: 2 additions & 2 deletions docs/modules/managers/managers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Managers

Service Manager
---------------
.. autoclass:: waves.core.models.services.ServiceManager
.. autoclass:: waves.wcore.models.services.ServiceManager
:members:
:undoc-members:

.. _job-manager-label:

Job Manager
-----------
.. autoclass:: waves.core.models.jobs.JobManager
.. autoclass:: waves.wcore.models.jobs.JobManager
:members:
:undoc-members:
2 changes: 1 addition & 1 deletion docs/modules/models/base.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Base classes

WAVEs defines few Bases classes shared among other models resources

.. automodule:: waves.core.models.base
.. automodule:: waves.wcore.models.base
:members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/modules/models/jobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Jobs

Jobs models documentation

.. autoclass:: waves.core.models.jobs.Job
.. autoclass:: waves.wcore.models.jobs.Job
:members:
:undoc-members:
:show-inheritance:
Expand All @@ -14,7 +14,7 @@ Job Inputs
----------
Job Inputs related to inputs defined in service configuration, see :ref:`service-inputs-label`.

.. autoclass:: waves.core.models.jobs.JobInput
.. autoclass:: waves.wcore.models.jobs.JobInput
:members:
:undoc-members:

Expand All @@ -24,7 +24,7 @@ Job Outputs
-----------
Job outputs related to outputs defined in service configuration

.. autoclass:: waves.core.models.jobs.JobOutput
.. autoclass:: waves.wcore.models.jobs.JobOutput
:members:
:undoc-members:

2 changes: 1 addition & 1 deletion docs/modules/models/runners.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Runners
Runners are in charge of running job on a specific 'Adaptor' configuration


.. automodule:: waves.core.models.runners
.. automodule:: waves.wcore.models.runners
:members:
:undoc-members:
:show-inheritance:
14 changes: 7 additions & 7 deletions docs/modules/models/services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Services

Services are the main entry point for WAVEs application, managed by :ref:`service-manager-label`.

.. autoclass:: waves.core.models.services.Service
.. autoclass:: waves.wcore.models.services.Service
:members:
:show-inheritance:

Services may be accessed from multiple 'submissions'

.. autoclass:: waves.core.models.submissions.Submission
.. autoclass:: waves.wcore.models.submissions.Submission
:members:
:show-inheritance:

Expand All @@ -21,7 +21,7 @@ Submission Inputs
-----------------

Base class for service inputs shared information
.. autoclass:: waves.core.models.inputs.AParam
.. autoclass:: waves.wcore.models.inputs.AParam
:members:
:show-inheritance:

Expand All @@ -31,14 +31,14 @@ Submission Outputs:
-------------------
Submission description defines expected outputs

.. autoclass:: waves.core.models.submissions.SubmissionOutput
.. autoclass:: waves.wcore.models.submissions.SubmissionOutput
:members:

Submission Outputs:
-------------------
Submission description defines expected exitcode

.. autoclass:: waves.core.models.submissions.SubmissionOutput
.. autoclass:: waves.wcore.models.submissions.SubmissionOutput
:members:


Expand All @@ -51,12 +51,12 @@ Input Samples

Services may provide sample data for their submissions

.. autoclass:: waves.core.models.samples.FileInputSample
.. autoclass:: waves.wcore.models.samples.FileInputSample
:members:
:undoc-members:
:show-inheritance:

.. autoclass:: waves.core.models.samples.SampleDepParam
.. autoclass:: waves.wcore.models.samples.SampleDepParam
:members:
:undoc-members:
:show-inheritance:
2 changes: 1 addition & 1 deletion docs/modules/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ WAVES custom settings

WAVES application defines a waves_settings attributes generated from WAVES_CORE Django settings dictionary,

.. automodule:: waves.core.settings
.. automodule:: waves.wcore.settings
:members: waves_settings

Here are the defaults values:
Expand Down
2 changes: 1 addition & 1 deletion docs/user_doc/service/services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Service Creation
- *Access restriction* : When service online status is 'restricted', along with all staff members, you can grant other 'web user' access to your service
- *Mail Notification* : Check or uncheck mail notification for this Service (this is disabled if configuration disallow it globally)
- *Api availability* : Set whether service is available on api as well as on the web
- *Command Class* : Parser Class : dedicated for specific and very complex command, set the :ref:`waves.core.commands` class implementation to create a job command line
- *Command Class* : Parser Class : dedicated for specific and very complex command, set the :ref:`waves.wcore.commands` class implementation to create a job command line
- *TimeRecord* : Creation and last update date, you can't set these values, they are assigned automatically

.. CAUTION::
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


def import_version():
from waves.core import __version__
from waves.wcore import __version__
return __version__


Expand All @@ -17,7 +17,7 @@ def import_version():
name='waves-core',
version=import_version(),
packages=find_packages(),
provides=['waves.core'],
provides=['waves.wcore'],
include_package_data=True,
license='GPLv3',
description='WAVES - core ',
Expand Down
8 changes: 0 additions & 8 deletions waves/core/admin/__init__.py

This file was deleted.

13 changes: 0 additions & 13 deletions waves/core/forms/lib/__init__.py

This file was deleted.

111 changes: 0 additions & 111 deletions waves/core/forms/lib/crispy.py

This file was deleted.

0 comments on commit 6903402

Please sign in to comment.