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

Update readme + add manifest for ansible files #109

Merged
merged 4 commits into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
4 changes: 4 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# maybe there is a better way to do it:
# https://stackoverflow.com/questions/1612733

recursive-include orchestrator/ansible *
Copy link
Owner

Choose a reason for hiding this comment

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

Maybe add include LICENSE also

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

running python setup.py bdist_wheel looks good on my side now. I've renamed the licence file to fit the spec.

Copy link
Owner

Choose a reason for hiding this comment

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

include LICENSE.txt is necessary for the dist package to work.
Should we publish only wheels ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

wheels is based on the new spec but if for any reason a system only allows users to use former formats we can also include the licence in the manifest.

Copy link
Owner

Choose a reason for hiding this comment

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

ok

26 changes: 12 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ cd ombt-orchestrator
* Install the dependencies
Copy link
Owner

Choose a reason for hiding this comment

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

It seems that the README isn't rendered correctly on pypi, that's probably because it's written in md instead of rst.
Should we move to rst README format ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I added in f856066 the proper type to the configuration, see: https://packaging.python.org/tutorials/distributing-packages/#description

Copy link
Owner

@msimonin msimonin Apr 9, 2018

Choose a reason for hiding this comment

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

once again 😺 👍 💡 !


```
virtualenv venv
source venv/bin/activate
pip install -U pip
pip install -r requirements.txt
pip install -e .
```

> On Grid'5000 you can launch this command from any frontend.
Expand All @@ -59,8 +57,8 @@ The default configurations are currently defined in the `conf.yaml` file.
## Command line interface

```
> cli.py
Usage: cli.py [OPTIONS] COMMAND [ARGS]...
> oo
Usage: oo [OPTIONS] COMMAND [ARGS]...

Options:
--help Show this message and exit.
Expand All @@ -83,14 +81,14 @@ Commands:
## Workflow to run a test case


* Deploying and launching the benchmark.
* Deploying and launching the benchmark (default driver `broker` is defined in the configuration file)

```
# default confs.yaml on $PWD will be read
> cli.py deploy --driver=rabbitmq vagrant
> oo deploy --driver=broker vagrant

# Launch the one benchmark
> cli.py test_case_1 --nbr_clients 10 --nbr_servers 2
> oo test_case_1 --nbr_clients 10 --nbr_servers 2
```

> Adapt to the relevant provider (e.g `g5k`)
Expand All @@ -102,7 +100,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f
* Backuping the environment

```
> cli.py backup
> oo backup
```

> The files retrieved by this action are located in `current/backup` dir by default.
Expand All @@ -111,11 +109,11 @@ Grafana is available on the port 3000 of the control node (check the inventory f

```
# Preparing the next run by cleaning the environment
> cli.py destroy
> cli.py deploy --driver=rabbitmq vagrant
> oo destroy
> oo deploy vagrant

# Next run
> cli.py test_case_1 --nbr_clients 20 --nbr_servers 2
> oo test_case_1 --nbr_clients 20 --nbr_servers 2
```

> It's possible to force an experimentation dir with `--env mydir`
Expand All @@ -130,7 +128,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f
to run the first test case enabled on the framework run:

``` shell
> cli.py campaign --provider g5k test_case_1
> oo campaign --provider g5k test_case_1
```

* Alternatively a campaign can be executed in a _incremental_ mode in which deployments are
Expand All @@ -150,7 +148,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f
instead of the default and execute:

``` shell
> cli.py campaign --incremental --provider g5k test_case_1
> oo campaign --incremental --provider g5k test_case_1
```

## Misc.
Expand Down
5 changes: 5 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ version = 1.0.0
description = Oslo messaging benchmarking orchestrator
keywords = benchmark, oslo messaging, RPC
license = GPL-3.0
license_file = LICENSE.txt
url = https://github.com/msimonin/ombt-orchestrator/
author = Matthieu Simonin
author_email = matthieu.simonin@inria.fr
long_description = file: README.md
long_description_content_type = text/markdown
Copy link
Owner

@msimonin msimonin Apr 9, 2018

Choose a reason for hiding this comment

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

😺 👍 💡

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the PKG-INFO in the tgz file set the value properly: Description-Content-Type: text/markdown

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

twine>=1.11.0 and setuptools>=38.6.0 are required for Markdown support according to this: pypi/warehouse#869

project_urls =
Bug Reports = https://github.com/msimonin/ombt-orchestrator/issues
Source = https://github.com/msimonin/ombt-orchestrator/
Expand Down Expand Up @@ -41,3 +43,6 @@ exclude =
[options.entry_points]
console_scripts =
oo = orchestrator.cli:cli

[bdist_wheel]
python-tag = py27