Skip to content

Commit 0e7e1b9

Browse files
committed
Update dependencies to current as of 2017-11-16
1 parent ffc41c1 commit 0e7e1b9

File tree

13 files changed

+33
-38
lines changed

13 files changed

+33
-38
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ python:
99
before_install:
1010
- sudo apt-get -q update
1111
- sudo apt-get -q install -y build-essential python-dev libssl-dev libxml2-dev
12-
libxslt1-dev libffi-dev postgresql-server-dev-9.3 openssl
12+
libxslt1-dev libffi-dev postgresql-server-dev-9.3 openssl libsmbclient-dev
13+
librsync-dev
1314
install:
1415
- pip install --upgrade pip
1516
- pip install --upgrade setuptools

client_cli/src/setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.cli',
31-
version='2.3.11',
31+
version='2.4.0',
3232
description='Command-Line Interface (CLI) for DataONE',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,8 +37,8 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.common == 2.3.11',
41-
'dataone.libclient == 2.3.11',
40+
'dataone.common == 2.4.0',
41+
'dataone.libclient == 2.4.0',
4242
#
4343
'requests == 2.18.4',
4444
],

client_onedrive/src/setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
def main():
3333
setuptools.setup(
3434
name='dataone.onedrive',
35-
version='2.3.11',
35+
version='2.4.0',
3636
description='Filesystem access to the DataONE Workspace',
3737
author='DataONE Project',
3838
author_email='[email protected]',
@@ -41,8 +41,8 @@ def main():
4141
packages=setuptools.find_packages(),
4242
include_package_data=True,
4343
install_requires=[
44-
'dataone.common == 2.3.11',
45-
'dataone.libclient == 2.3.11',
44+
'dataone.common == 2.4.0',
45+
'dataone.libclient == 2.4.0',
4646
#
4747
'fusepy == 2.0.4',
4848
'pyxb == 1.2.6',

dev_tools/src/d1_dev/pip-update-all.py

+6-12
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
from __future__ import absolute_import
2929

30-
import datetime
3130
import os
31+
import subprocess
3232
import sys
3333

3434

@@ -38,19 +38,13 @@ def main():
3838
except EnvironmentError:
3939
sys.exit('Must be root')
4040

41-
os.system(
42-
"pip freeze > pip_freeze_{}.txt"
43-
.format(datetime.datetime.now().isoformat())
44-
)
41+
freeze_str = subprocess.check_output(['pip', 'freeze'])
4542

46-
os.system(
47-
"pip freeze --local | "
48-
"grep -v '^\-e' | "
49-
"cut -d = -f 1 | "
50-
"xargs -n1 pip install -U"
51-
)
43+
for line_str in freeze_str.splitlines():
44+
pkg_str, ver_str = line_str.strip().split('==')
45+
print subprocess.check_output(['pip', 'install', '--upgrade', pkg_str])
5246

53-
os.system("pip check")
47+
print subprocess.check_output(['pip', 'check'])
5448

5549

5650
if __name__ == '__main__':

dev_tools/src/d1_dev/src-sync-dependencies.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
import d1_dev.util
4343

44-
import d1_common.iter.file as file_iterator
44+
import d1_common.iter.dir
4545
import d1_common.util
4646

4747

@@ -77,7 +77,7 @@ def main():
7777

7878
d1_common.util.log_setup(args.debug)
7979

80-
for setup_path in file_iterator.dir_iter(
80+
for setup_path in d1_common.iter.dir.dir_iter(
8181
path_list=[args.path],
8282
include_glob_list=['setup.py'],
8383
exclude_glob_list=args.exclude,

dev_tools/src/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
def main():
3030
setuptools.setup(
3131
name='dataone.dev',
32-
version='2.3.11',
32+
version='2.4.0',
3333
description='DataONE developer tools',
3434
author='DataONE Project',
3535
author_email='[email protected]',

gmn/src/d1_gmn/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.3.11'
1+
__version__ = '2.4.0'

gmn/src/setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131
# noinspection PyUnresolvedReferences
3232
setuptools.setup(
3333
name='dataone.gmn',
34-
version='2.3.11',
34+
version='2.4.0',
3535
description='DataONE Generic Member Node (GMN)',
3636
author='DataONE Project',
3737
author_email='[email protected]',
@@ -43,9 +43,9 @@ def main():
4343
'': ['settings.py'],
4444
},
4545
install_requires=[
46-
'dataone.cli == 2.3.11',
47-
'dataone.common == 2.3.11',
48-
'dataone.libclient == 2.3.11',
46+
'dataone.cli == 2.4.0',
47+
'dataone.common == 2.4.0',
48+
'dataone.libclient == 2.4.0',
4949
#
5050
'django == 1.11.7',
5151
'iso8601 == 0.1.12',

lib_client/src/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.libclient',
31-
version='2.3.11',
31+
version='2.4.0',
3232
description='A DataONE client library for Python',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,7 +37,7 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.common == 2.3.11',
40+
'dataone.common == 2.4.0',
4141
#
4242
'cachecontrol == 0.12.3',
4343
'pyxb == 1.2.6',

lib_common/src/d1_common/const.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
)
3838

3939
# Version of the DataONE Python stack
40-
VERSION = '2.3.11'
40+
VERSION = '2.4.0'
4141

4242
# Maximum number of entries per list objects request
4343
MAX_LISTOBJECTS = 1000

lib_common/src/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.common',
31-
version='2.3.11',
31+
version='2.4.0',
3232
description=(
3333
'Contains functionality common to projects that interact with '
3434
'the DataONE infrastructure via Python'

test_utilities/src/setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.test_utilities',
31-
version='2.3.11',
31+
version='2.4.0',
3232
description='Utilities for testing DataONE infrastructure components',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,7 +37,7 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.libclient == 2.3.11',
40+
'dataone.libclient == 2.4.0',
4141
#
4242
'contextlib2 == 0.5.5',
4343
'coverage == 4.4.2',
@@ -48,7 +48,7 @@ def main():
4848
'multi-mechanize == 1.2.0',
4949
'posix-ipc == 1.0.0',
5050
'pyasn1 == 0.3.7',
51-
'pytest == 3.2.3',
51+
'pytest == 3.2.5',
5252
'pytest-catchlog == 1.2.2',
5353
'pytest-cov == 2.5.1',
5454
'pytest-cov == 2.5.1',

tools/src/setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
def main():
3030
setuptools.setup(
3131
name='dataone.tools',
32-
version='2.3.11',
32+
version='2.4.0',
3333
description='DataONE tools and examples',
3434
author='DataONE Project',
3535
author_email='[email protected]',
@@ -42,9 +42,9 @@ def main():
4242
},
4343
install_requires=[
4444
# These are not yet available when bootstrapping on Travis
45-
'dataone.cli == 2.3.11',
46-
'dataone.common == 2.3.11',
47-
'dataone.libclient == 2.3.11',
45+
'dataone.cli == 2.4.0',
46+
'dataone.common == 2.4.0',
47+
'dataone.libclient == 2.4.0',
4848
],
4949
setup_requires=[
5050
'setuptools_git >= 1.1',

0 commit comments

Comments
 (0)