[ARVADOS] updated: 949e27e0dd0a97cf78f0b90636df387fa0d65be3

git at public.curoverse.com git at public.curoverse.com
Fri May 9 16:51:17 EDT 2014


Summary of changes:
 sdk/python/MANIFEST.in                             |  1 -
 sdk/python/requirements.txt                        | 14 ++++++-------
 sdk/python/setup.py                                |  3 +--
 sdk/python/setup.py.src                            | 23 ----------------------
 sdk/python/setup_header.py                         | 19 ------------------
 services/fuse/.gitignore                           |  1 +
 .../fuse/arvados_fuse}/__init__.py                 |  0
 {sdk/python => services/fuse}/bin/arv-mount        |  2 +-
 {sdk/python => services/fuse}/readme.llfuse        |  0
 services/fuse/requirements.txt                     |  3 +++
 services/fuse/run_test_server.py                   |  1 +
 sdk/python/setup_fuse.py => services/fuse/setup.py | 11 ++++++-----
 {sdk/python => services/fuse}/test_mount.py        |  2 +-
 13 files changed, 20 insertions(+), 60 deletions(-)
 delete mode 100644 sdk/python/MANIFEST.in
 delete mode 100644 sdk/python/setup.py.src
 delete mode 100644 sdk/python/setup_header.py
 create mode 120000 services/fuse/.gitignore
 rename {sdk/python/arvados/fuse => services/fuse/arvados_fuse}/__init__.py (100%)
 rename {sdk/python => services/fuse}/bin/arv-mount (99%)
 rename {sdk/python => services/fuse}/readme.llfuse (100%)
 create mode 100644 services/fuse/requirements.txt
 create mode 120000 services/fuse/run_test_server.py
 rename sdk/python/setup_fuse.py => services/fuse/setup.py (71%)
 rename {sdk/python => services/fuse}/test_mount.py (99%)

       via  949e27e0dd0a97cf78f0b90636df387fa0d65be3 (commit)
       via  b20333af04a3507b85c52cc4e50a0e2c3fc04433 (commit)
       via  a7100af369a892a7f38eb2875320a7c742ec4da8 (commit)
       via  60c604d8e89501af180487ae7b39c1e25a66c8f3 (commit)
       via  b249529bb02dd34e54f8816222ebf81d778c957b (commit)
      from  568d941d3fe4bc554af0bca6c1dc4d9fc66ce999 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 949e27e0dd0a97cf78f0b90636df387fa0d65be3
Merge: 568d941 b20333a
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 9 16:51:17 2014 -0400

    Merge branch '2803-python-package-split-wip'
    
    Closes #2803, #2804.


commit b20333af04a3507b85c52cc4e50a0e2c3fc04433
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 9 16:24:00 2014 -0400

    2803: Relax Python library requirements.
    
    Refs #2803.  We're generally undemanding on the libraries we pull in,
    and this can help us use more OS-packaged libraries.

diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt
index 0bea19b..a82fe9e 100644
--- a/sdk/python/requirements.txt
+++ b/sdk/python/requirements.txt
@@ -1,6 +1,6 @@
-google-api-python-client==1.2
-httplib2==0.8
-python-gflags==2.0
-urllib3==1.7.1
-ws4py==0.3.4
-PyYAML==3.11
+google-api-python-client>=1.2
+httplib2>=0.8
+python-gflags>=2.0
+urllib3>=1.7.0
+ws4py>=0.3
+PyYAML>=3.0
diff --git a/services/fuse/requirements.txt b/services/fuse/requirements.txt
index 079ebd2..8906b24 100644
--- a/services/fuse/requirements.txt
+++ b/services/fuse/requirements.txt
@@ -1,3 +1,3 @@
 arvados-python-client>=0.1
-llfuse==0.40
-python-daemon==1.6
+llfuse>=0.40
+python-daemon>=1.5

commit a7100af369a892a7f38eb2875320a7c742ec4da8
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 9 16:18:11 2014 -0400

    2803: FUSE driver is now under the AGPL.
    
    This is both our intent after the package split, and consistent with
    /COPYING file.

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 835c20d..fd774b7 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -9,7 +9,7 @@ setup(name='arvados_fuse',
       author_email='info at arvados.org',
       url="https://arvados.org",
       download_url="https://github.com/curoverse/arvados.git",
-      license='Apache 2.0',
+      license='GNU Affero General Public License, version 3.0',
       packages=['arvados_fuse'],
       scripts=[
         'bin/arv-mount'

commit 60c604d8e89501af180487ae7b39c1e25a66c8f3
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 9 14:37:07 2014 -0400

    2803: Split arvados and arvados_fuse Python modules.
    
    Prior commits tried to make separate SDK and FUSE packages from the
    same sdk/python source tree.  However, this didn't work as intended
    once the packages were installed.  Python modules don't work like Ruby
    namespaces.  If you ask Python to import arvados.fuse, it finds the
    arvados module, then looks for the fuse submodule under it.  So you
    can't have arvados.fuse installed somewhere completely differently.
    
    In addition, Python packages assume the installation script is called
    setup.py.  So they wouldn't find setup_fuse.py.
    
    We still want to have the FUSE module separate, so in discussion on
    IRC we decided that the least worst option was to rename the module to
    arvados_fuse.  This commit implements that.  If accepted, the new
    build procedure will be:
    
      $ python setup.py egg_info -b \
        ".$(git log --format=format:%ct.%h -n1 .)" sdist upload
    
    Refs #2803.

diff --git a/sdk/python/MANIFEST.in b/sdk/python/MANIFEST.in
deleted file mode 100644
index e03678f..0000000
--- a/sdk/python/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-include setup_header.py
\ No newline at end of file
diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt
index a6a7591..0bea19b 100644
--- a/sdk/python/requirements.txt
+++ b/sdk/python/requirements.txt
@@ -2,7 +2,5 @@ google-api-python-client==1.2
 httplib2==0.8
 python-gflags==2.0
 urllib3==1.7.1
-llfuse==0.40
 ws4py==0.3.4
 PyYAML==3.11
-python-daemon==1.6
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index e8bcb5c..3e756ce 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,8 +1,7 @@
 from setuptools import setup
-import setup_header
 
 setup(name='arvados-python-client',
-      version='0.1.' + setup_header.minor_version,
+      version='0.1',
       description='Arvados client library',
       author='Arvados',
       author_email='info at arvados.org',
diff --git a/sdk/python/setup_header.py b/sdk/python/setup_header.py
deleted file mode 100644
index 21b9500..0000000
--- a/sdk/python/setup_header.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import shutil
-import os
-import sys
-import re
-
-if os.path.exists("PKG-INFO"):
-    with open("PKG-INFO", "r") as p:
-        for l in p:
-            g = re.match(r'Version: (.*)', l)
-            if g != None:
-                minor_version = g.group(1)
-else:
-    with os.popen("git log --format=format:%ct.%h -n1 .") as m:
-        minor_version = m.read()
-
-# setup.py and setup_fuse.py both share the build/ directory (argh!) so
-# make sure to delete it to avoid scooping up the wrong files.
-build_dir = os.path.join(os.path.dirname(sys.argv[0]), 'build')
-shutil.rmtree(build_dir, ignore_errors=True)
diff --git a/services/fuse/.gitignore b/services/fuse/.gitignore
new file mode 120000
index 0000000..ed3b362
--- /dev/null
+++ b/services/fuse/.gitignore
@@ -0,0 +1 @@
+../../sdk/python/.gitignore
\ No newline at end of file
diff --git a/sdk/python/arvados/fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
similarity index 100%
rename from sdk/python/arvados/fuse/__init__.py
rename to services/fuse/arvados_fuse/__init__.py
diff --git a/sdk/python/bin/arv-mount b/services/fuse/bin/arv-mount
similarity index 99%
rename from sdk/python/bin/arv-mount
rename to services/fuse/bin/arv-mount
index e7e559c..f6b2992 100755
--- a/sdk/python/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from arvados.fuse import *
+from arvados_fuse import *
 import arvados
 import subprocess
 import argparse
diff --git a/sdk/python/readme.llfuse b/services/fuse/readme.llfuse
similarity index 100%
rename from sdk/python/readme.llfuse
rename to services/fuse/readme.llfuse
diff --git a/services/fuse/requirements.txt b/services/fuse/requirements.txt
new file mode 100644
index 0000000..079ebd2
--- /dev/null
+++ b/services/fuse/requirements.txt
@@ -0,0 +1,3 @@
+arvados-python-client>=0.1
+llfuse==0.40
+python-daemon==1.6
diff --git a/services/fuse/run_test_server.py b/services/fuse/run_test_server.py
new file mode 120000
index 0000000..8d0a3b1
--- /dev/null
+++ b/services/fuse/run_test_server.py
@@ -0,0 +1 @@
+../../sdk/python/run_test_server.py
\ No newline at end of file
diff --git a/sdk/python/setup_fuse.py b/services/fuse/setup.py
similarity index 76%
rename from sdk/python/setup_fuse.py
rename to services/fuse/setup.py
index 0a05f3f..835c20d 100644
--- a/sdk/python/setup_fuse.py
+++ b/services/fuse/setup.py
@@ -1,15 +1,16 @@
+#!/usr/bin/env python
+
 from setuptools import setup
-import setup_header
 
-setup(name='arvados-fuse-driver',
-      version='0.1.' + setup_header.minor_version,
+setup(name='arvados_fuse',
+      version='0.1',
       description='Arvados FUSE driver',
       author='Arvados',
       author_email='info at arvados.org',
       url="https://arvados.org",
       download_url="https://github.com/curoverse/arvados.git",
       license='Apache 2.0',
-      packages=['arvados.fuse'],
+      packages=['arvados_fuse'],
       scripts=[
         'bin/arv-mount'
         ],
diff --git a/sdk/python/test_mount.py b/services/fuse/test_mount.py
similarity index 99%
rename from sdk/python/test_mount.py
rename to services/fuse/test_mount.py
index fd7348b..a644003 100644
--- a/sdk/python/test_mount.py
+++ b/services/fuse/test_mount.py
@@ -1,6 +1,6 @@
 import unittest
 import arvados
-import arvados.fuse as fuse
+import arvados_fuse as fuse
 import threading
 import time
 import os

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list