[ARVADOS] created: a2d52e5693407eecf0f375ed3a72c581b303aa5c
git at public.curoverse.com
git at public.curoverse.com
Fri May 9 14:38:58 EDT 2014
at a2d52e5693407eecf0f375ed3a72c581b303aa5c (commit)
commit a2d52e5693407eecf0f375ed3a72c581b303aa5c
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/keep-fuse-driver/.gitignore b/services/keep-fuse-driver/.gitignore
new file mode 120000
index 0000000..ed3b362
--- /dev/null
+++ b/services/keep-fuse-driver/.gitignore
@@ -0,0 +1 @@
+../../sdk/python/.gitignore
\ No newline at end of file
diff --git a/sdk/python/arvados/fuse/__init__.py b/services/keep-fuse-driver/arvados_fuse/__init__.py
similarity index 100%
rename from sdk/python/arvados/fuse/__init__.py
rename to services/keep-fuse-driver/arvados_fuse/__init__.py
diff --git a/sdk/python/bin/arv-mount b/services/keep-fuse-driver/bin/arv-mount
similarity index 99%
rename from sdk/python/bin/arv-mount
rename to services/keep-fuse-driver/bin/arv-mount
index e7e559c..f6b2992 100755
--- a/sdk/python/bin/arv-mount
+++ b/services/keep-fuse-driver/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/keep-fuse-driver/readme.llfuse
similarity index 100%
rename from sdk/python/readme.llfuse
rename to services/keep-fuse-driver/readme.llfuse
diff --git a/services/keep-fuse-driver/requirements.txt b/services/keep-fuse-driver/requirements.txt
new file mode 100644
index 0000000..079ebd2
--- /dev/null
+++ b/services/keep-fuse-driver/requirements.txt
@@ -0,0 +1,3 @@
+arvados-python-client>=0.1
+llfuse==0.40
+python-daemon==1.6
diff --git a/services/keep-fuse-driver/run_test_server.py b/services/keep-fuse-driver/run_test_server.py
new file mode 120000
index 0000000..8d0a3b1
--- /dev/null
+++ b/services/keep-fuse-driver/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/keep-fuse-driver/setup.py
similarity index 82%
rename from sdk/python/setup_fuse.py
rename to services/keep-fuse-driver/setup.py
index 0a05f3f..309d3c0 100644
--- a/sdk/python/setup_fuse.py
+++ b/services/keep-fuse-driver/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,
+ 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/keep-fuse-driver/test_mount.py
similarity index 99%
rename from sdk/python/test_mount.py
rename to services/keep-fuse-driver/test_mount.py
index fd7348b..a644003 100644
--- a/sdk/python/test_mount.py
+++ b/services/keep-fuse-driver/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
commit b249529bb02dd34e54f8816222ebf81d778c957b
Author: Brett Smith <brett at curoverse.com>
Date: Fri May 9 10:44:16 2014 -0400
2803: Remove unused setup.py.src.
diff --git a/sdk/python/setup.py.src b/sdk/python/setup.py.src
deleted file mode 100644
index fbb8c52..0000000
--- a/sdk/python/setup.py.src
+++ /dev/null
@@ -1,23 +0,0 @@
-setup(name='arvados-python-client',
- version='0.1.' + minor_version,
- description='Arvados client library',
- 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'],
- scripts=[
- 'bin/arv-get',
- 'bin/arv-put',
- 'bin/arv-ls',
- 'bin/arv-normalize',
- ],
- install_requires=[
- 'python-gflags',
- 'google-api-python-client',
- 'httplib2',
- 'urllib3',
- 'ws4py'
- ],
- zip_safe=False)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list