From 2ec4556ac4228179ecb3671e852f1b5685067109 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Thu, 10 Mar 2016 15:17:49 -0300 Subject: [setup] Added dirspec url to requirements I also added a conditional to the setup.py so that python setup.py develop can be used even with the dirspec url --- pkg/requirements.pip | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkg/requirements.pip') diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 02fb189..bb6cf99 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 +dirspec -- cgit v1.2.3 From 4fb7e8724302f4fe30891b6132e9b85472d42708 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Thu, 10 Mar 2016 15:42:54 -0300 Subject: [setup] pycommon pip installs in edit mode Leap pycommon will now be installed in editable mode when you use pip install, so that you can run the tests and develop using only pip --- pkg/requirements.pip | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg/requirements.pip') diff --git a/pkg/requirements.pip b/pkg/requirements.pip index bb6cf99..bbf60f1 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -5,3 +5,4 @@ pyzmq>=14.4.1 txzmq>=0.7.3 https://launchpad.net/dirspec/stable-13-10/13.10/+download/dirspec-13.10.tar.gz dirspec +-e . -- cgit v1.2.3 From 77ff0a10eb83263fdfb94e0bc9b1a38fd7e434f8 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Thu, 10 Mar 2016 16:04:57 -0300 Subject: [setup] Added docs on how to run the tests Also added dirspec directly to the setuptools for now, because it needs the dependency along with the url, but pip would break if it had both --- pkg/requirements.pip | 1 - 1 file changed, 1 deletion(-) (limited to 'pkg/requirements.pip') diff --git a/pkg/requirements.pip b/pkg/requirements.pip index bbf60f1..b2be31f 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -4,5 +4,4 @@ python-dateutil pyzmq>=14.4.1 txzmq>=0.7.3 https://launchpad.net/dirspec/stable-13-10/13.10/+download/dirspec-13.10.tar.gz -dirspec -e . -- cgit v1.2.3 From 40e5d40c7c725709ac3fd770e6070fbe02e4b7e0 Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 6 Jul 2016 08:46:33 +0200 Subject: [pkg] remove dependency on dirspec This commit removes the dep introduced in 5e12233 by just importing some tiny bit of dirspec code. The previous change was introduced because: * pyxdg did not account for Mac OS specifics, i.e. using ~/Library/ directory structure instead of .config (see: https://leap.se/code/issues/3574). * dirspec does the correct thing for xdg on Mac OS. * u1db depends on dirspec anyway. The problem is that dirspec is not maintained and published on pypi, what forces us to download it from an URL and add exceptions to be able to pip install it. As we are removing dependence on u1db on other modules, we can also remove it here. To workaround the Mac OS problem, we just add some code from dirspec to ensure we get the correct directory on Mac OS. --- pkg/requirements.pip | 1 - 1 file changed, 1 deletion(-) (limited to 'pkg/requirements.pip') diff --git a/pkg/requirements.pip b/pkg/requirements.pip index b2be31f..b02c8b5 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -3,5 +3,4 @@ pyopenssl python-dateutil pyzmq>=14.4.1 txzmq>=0.7.3 -https://launchpad.net/dirspec/stable-13-10/13.10/+download/dirspec-13.10.tar.gz -e . -- cgit v1.2.3