Skip to content

Commit

Permalink
NXDRIVE-218: Remove all alembic / SQLAlchemy related code
Browse files Browse the repository at this point in the history
  • Loading branch information
ataillefer committed Apr 1, 2015
1 parent a931d0e commit 3dd9825
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 29 deletions.
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
alembic==0.6.4
argparse==1.2.1
coverage==3.7.1
esky==0.9.8
faulthandler==2.3
mako==0.9.1
nose==1.3.1
poster==0.8.1
psutil==2.1.1
SQLAlchemy==0.9.4
Send2Trash==1.3.0
watchdog==0.8.1
universal-analytics-python==0.2.4
Expand Down
2 changes: 1 addition & 1 deletion resources/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ X-Python-Version: >= 2.7

Package: @package.name@
Architecture: all
Depends: ${python:Depends}, python-sqlalchemy (>= 0.7.9), python-psutil, python-faulthandler, python-poster (>= 0.8.1), python-crypto (>= 2.6)
Depends: ${python:Depends}, python-psutil, python-faulthandler, python-poster (>= 0.8.1), python-crypto (>= 2.6)
Provides: nuxeo-drive-client
Conflicts: nuxeo-drive-client
Description: Client side of Nuxeo Driver
Expand Down
21 changes: 2 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,6 @@ def get_icons_home(self):
return os.path.join(self.rubric_2nd_dir(), self.rubric_3rd_dir(),
'data', 'icons')

def get_alembic_home(self):
return os.path.join(self.rubric_super_dir(), self.rubric_2nd_dir(),
'alembic')

def get_alembic_versions_home(self):
return os.path.join(self.rubric_super_dir(), self.rubric_2nd_dir(),
'alembic', 'versions')

def get_win_icon(self):
return 'nuxeo_drive_icon_64.ico'

Expand Down Expand Up @@ -288,8 +280,6 @@ def __init__(self, driveAttributes):
package_data = attribs.get_package_data()
icons_home = attribs.get_icons_home()
ui5_home = attribs.get_ui5_home()
alembic_home = attribs.get_alembic_home()
alembic_versions_home = attribs.get_alembic_versions_home()

win_icon = os.path.join(icons_home, attribs.get_win_icon())
png_icon = os.path.join(icons_home, attribs.get_png_icon())
Expand All @@ -302,22 +292,16 @@ def __init__(self, driveAttributes):
else:
icon = png_icon

# Files to include in frozen app: icons, alembic, alembic versions
# Files to include in frozen app
# build_exe freeze with cx_Freeze (Windows)
include_files = attribs.get_includes()
# bdist_esky freeze with cx_Freeze (Windows) and py2app (OS X)
# In fact this is a global setup option
# TODO NXP-13810: check removed data_files from py2app and added to
# global setup
icon_files = data_file_dir(icons_home, 'icons', include_files).load()
alembic_files = data_file_dir(
alembic_home, 'alembic', include_files).load()
alembic_version_files = data_file_dir(
alembic_versions_home,
'alembic/versions', include_files).load()
ui5_files = data_file_dir(ui5_home, 'ui5', include_files).load_recursive()
data_files = [('icons', icon_files), ('alembic', alembic_files),
('alembic/versions', alembic_version_files)]
data_files = [('icons', icon_files)]
data_files.extend(ui5_files)
data_files.extend(attribs.get_data_files())
old_version = None
Expand Down Expand Up @@ -352,7 +336,6 @@ def __init__(self, driveAttributes):
"PyQt4.QtNetwork",
"PyQt4.QtGui",
"atexit", # implicitly required by PyQt4
"sqlalchemy.dialects.sqlite",
"cffi",
"xattr",
]
Expand Down
6 changes: 0 additions & 6 deletions tools/setup_server_binding.py

This file was deleted.

0 comments on commit 3dd9825

Please sign in to comment.