diff options
| author | Kali Kaneko <kali@leap.se> | 2016-03-11 15:32:40 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-03-11 15:32:40 -0400 |
| commit | 9c566981e4e091cd0f9f44ba28d4425b9791cfe7 (patch) | |
| tree | 3f66625daa0a6d32245793bf483bc93d0daf7bac | |
| parent | 07dff4d010b284d8d46eb3b8a859083013c7441f (diff) | |
| parent | 77ff0a10eb83263fdfb94e0bc9b1a38fd7e434f8 (diff) | |
Merge remote-tracking branch 'leapcode/pr/138' into develop
| -rw-r--r-- | README.rst | 14 | ||||
| -rw-r--r-- | pkg/requirements.pip | 7 | ||||
| -rw-r--r-- | setup.py | 10 |
3 files changed, 24 insertions, 7 deletions
@@ -29,3 +29,17 @@ Using `leap.common.http` needs some extra dependencies (twisted.web >= 14.0.2, python-service-identity). You can install them by running:: pip install leap.common[http] + + +Running the tests +------------------- +To run the tests, first run the setup with: + +.. code-block:: +pip install -r pkg/requirements.pip +pip install -r pkg/requirements-testing.pip + +After that you can run the tests with + +.. code-block:: +trial leap.common diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 02fb189..b2be31f 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,8 +1,7 @@ -jsonschema #<=0.8 -- are we done with this conflict? -dirspec +jsonschema pyopenssl python-dateutil pyzmq>=14.4.1 txzmq>=0.7.3 - -#autopep8 -- ??? +https://launchpad.net/dirspec/stable-13-10/13.10/+download/dirspec-13.10.tar.gz +-e . @@ -29,7 +29,11 @@ versioneer.versionfile_build = 'leap/common/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.common-' -parsed_reqs = utils.parse_requirements() +requirements = utils.parse_requirements() + +dependency_links = [requirement for requirement in requirements if requirement.startswith('http')] +requirements = [requirement for requirement in requirements if requirement not in dependency_links] +requirements.append('dirspec') tests_requirements = [ 'mock', @@ -134,8 +138,8 @@ setup( # packages=find_packages('src', exclude=['leap.common.tests']), packages=find_packages('src'), test_suite='leap.common.tests', - install_requires=parsed_reqs, - # dependency_links=dependency_links, + install_requires=requirements, + dependency_links=dependency_links, tests_require=tests_requirements, include_package_data=True, zip_safe=False, |