Skip to content

Commit

Permalink
Merge branch 'release/0.24.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed Jun 16, 2017
2 parents 945f5bd + ceccbfa commit 784966b
Show file tree
Hide file tree
Showing 53 changed files with 2,974 additions and 1,039 deletions.
26 changes: 23 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,33 @@ For running the client:

$ sudo pip install -r conans/requirements.txt


In OSX you should also install:

::

$ sudo pip install -r conans/requirements_osx.txt

Server:

::

$ sudo apt-get install python-dev
$ sudo pip install -r conans/requirements_server.txt

Development:
Development (for running the tests):

::

$ sudo pip install -r conans/requirements_dev.txt


If you are in Windows, using ``sudo`` is not required.

Running the tests
~~~~~~~~~~~~~~~~~~

Make sure that the Python requirements have been installed.
Make sure that the Python requirements for testing have been installed, as explained above.

Before you can run the tests, you need to set a few environment
variables first.
Expand All @@ -108,7 +118,7 @@ On Windows it would be (while being in the conan root directory):

::

$ export PYTHONPATH=.
$ set PYTHONPATH=.

Ensure that your ``cmake`` has version 2.8 or later. You can see the
version with the following command:
Expand Down Expand Up @@ -163,6 +173,16 @@ A few minutes later it should print ``OK``:

OK

To run specific tests, you can specify the test name too, something like:

::

$ nosetests conans.test.integration.flat_requirements_test --nocapture


The ``--nocapture`` argument can be useful to see some output that otherwise is captured by nosetests.


Create a launcher
~~~~~~~~~~~~~~~~~

Expand Down
3 changes: 2 additions & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
COMPLEX_SEARCH_CAPABILITY = "complex_search"
SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]

__version__ = '0.23.2'
__version__ = '0.24.0'

665 changes: 197 additions & 468 deletions conans/client/command.py

Large diffs are not rendered by default.

74 changes: 0 additions & 74 deletions conans/client/command_profile_args.py

This file was deleted.

Loading

0 comments on commit 784966b

Please sign in to comment.