diff options
| author | Kali Kaneko <kali@leap.se> | 2016-09-20 17:07:14 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-09-20 17:07:14 -0400 |
| commit | a889a5480b3807d887c3f196963236b2667bb8fa (patch) | |
| tree | 47b3dced8e2925ca1e5cede25223e866ef61e80d /pkg | |
| parent | f063726b3ad003693010555d57dbc214f6abb01d (diff) | |
| parent | 34ee56766446a1072599bd5641ffdf2a89442462 (diff) | |
Merge branch 'debian/experimental' into debian/platform-0.9
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements-testing.pip | 3 | ||||
| -rw-r--r-- | pkg/requirements.pip | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip deleted file mode 100644 index c5a3ad0..0000000 --- a/pkg/requirements-testing.pip +++ /dev/null @@ -1,3 +0,0 @@ -mock -setuptools-trial -pep8 diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 02fb189..b02c8b5 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,8 +1,6 @@ -jsonschema #<=0.8 -- are we done with this conflict? -dirspec +jsonschema pyopenssl python-dateutil pyzmq>=14.4.1 txzmq>=0.7.3 - -#autopep8 -- ??? +-e . |