[ARVADOS] created: 1.4.1
Git user
git at public.curoverse.com
Thu Nov 7 18:37:59 UTC 2019
at 31d312ad2bfec9131c376d6d6206804c3608fcb9 (commit)
commit 31d312ad2bfec9131c376d6d6206804c3608fcb9
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Sat Sep 21 09:30:59 2019 -0400
15649: Revert python-arvados-sdk dependency change accidentally
introduced in commit ce4e615391bfda40400fd1ca6e03eab6aa4fd77e
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 7b39daa0a..3dd79b8e0 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -36,7 +36,7 @@ setup(name='arvados-node-manager',
],
install_requires=[
'apache-libcloud==2.5.0', # 2.6.0 cannot create azure nodes, #15649
- 'arvados-python-client{}'.format(pysdk_dep),
+ 'arvados-python-client>=0.1.20170731145219',
'future',
'pykka < 2',
'python-daemon',
commit cff7ea9429ccfd950bbd8df6153f9f80b6e112eb
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date: Fri Sep 20 12:49:15 2019 -0300
15648: update documentation adding upgrade to rh-python36
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 053acb220..894e31b86 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -30,7 +30,13 @@ Note to developers: Add new items at the top. Include the date, issue number, co
TODO: extract this information based on git commit messages and generate changelogs / release notes automatically.
{% endcomment %}
-h3. v1.4.0 (2019-05-31)
+h3(#v1_4_1). v1.4.1 (2019-09-20)
+
+h4. Centos7 Python 3 dependency upgraded to rh-python36
+
+The Python 3 dependency for Centos7 Arvados packages was upgraded from rh-python35 to rh-python36.
+
+h3(#v1_4_0). v1.4.0 (2019-06-05)
h4. Populating the new file_count and file_size_total columns on the collections table
commit c8c75cbc7afec458427a1b4384eda9d3b62a8014
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date: Thu Sep 19 15:57:59 2019 -0300
15648: update to rh-python36
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index ad6f4e1e8..01729c9bf 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -29,8 +29,8 @@ RUN ln -s /usr/local/node-v6.11.2-linux-x64/bin/* /usr/local/bin/
# Need to "touch" RPM database to workaround bug in interaction between
# overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install rh-python35
-RUN scl enable rh-python35 "easy_install-3.5 pip" && easy_install-2.7 pip
+RUN touch /var/lib/rpm/* && yum -q -y install rh-python36
+RUN scl enable rh-python36 "easy_install-3.6 pip" && easy_install-2.7 pip
# Add epel, we need it for the python-pam dependency
RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -42,4 +42,4 @@ RUN git clone --depth 1 git://git.curoverse.com/arvados.git /tmp/arvados && cd /
RUN pip install --upgrade setuptools
ENV WORKSPACE /arvados
-CMD ["scl", "enable", "rh-python35", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
+CMD ["scl", "enable", "rh-python36", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index b800d43e0..30963fac8 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -127,7 +127,7 @@ case "$TARGET" in
PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/site-packages
PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
- PYTHON3_PREFIX=/opt/rh/rh-python35/root/usr
+ PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr
PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages
export PYCURL_SSL_LIBRARY=nss
;;
diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index 29697e440..fca8d8b12 100644
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -23,7 +23,7 @@ RestartPreventExitStatus=2
# This unwieldy ExecStart command detects at runtime whether
# arvados-docker-cleaner is installed with the Python 3.3 Software
# Collection, and if so, invokes it with the "scl" wrapper.
-ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python35/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python35 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi'
+ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python36/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python36 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi'
# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
StartLimitInterval=0
commit ce4e615391bfda40400fd1ca6e03eab6aa4fd77e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Sep 20 11:16:04 2019 -0400
15649: Pin libcloud 2.5.0.
libcloud 2.6.0 uses an incorrect blob storage URL when creating Azure
nodes.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index ef0546781..7b39daa0a 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -35,23 +35,20 @@ setup(name='arvados-node-manager',
('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst', 'arvados-node-manager.service']),
],
install_requires=[
- 'apache-libcloud>=2.3.1.dev1',
- 'arvados-python-client>=0.1.20170731145219',
+ 'apache-libcloud==2.5.0', # 2.6.0 cannot create azure nodes, #15649
+ 'arvados-python-client{}'.format(pysdk_dep),
'future',
'pykka < 2',
'python-daemon',
'setuptools',
'subprocess32>=3.5.1',
],
- dependency_links=[
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.3.1.dev1.zip"
- ],
test_suite='tests',
tests_require=[
'requests',
'pbr<1.7.0',
'mock>=1.0',
- 'apache-libcloud>=2.3.1.dev1',
+ 'apache-libcloud==2.5.0',
'subprocess32>=3.5.1',
],
zip_safe=False
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list