upstream python-irodsclient now supports data object copy, no need to…

… use fork, also updated in iRODS
cyverse · Apr 10, 2017 · 0e7079a · 0e7079a
1 parent 1c97e4f
commit 0e7079a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/requirements.in b/requirements.in
@@ -1,5 +1,4 @@
 -e git+https://github.com/steve-gregory/billiard.git#egg=billiard # TEMPORARY
--e git+https://github.com/c-mart/python-irodsclient.git@data-object-copy#egg=python-irodsclient  # Temporary until https://github.com/irods/python-irodsclient/pull/67 is merged
 
 Django==1.10.6
 django-cors-headers==0.12.0

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,6 @@
 #    pip-compile --output-file requirements.txt requirements.in
 #
 -e git+https://github.com/steve-gregory/billiard.git#egg=billiard
--e git+https://github.com/c-mart/python-irodsclient.git@data-object-copy#egg=python-irodsclient
 
 amqp==2.1.4               # via kombu
 ansible==2.2.1.0          # via subspace
@@ -92,8 +91,7 @@ pyparsing==2.2.0          # via cliff, cmd2, oslo.utils, packaging
 python-cinderclient==1.9.0  # via python-openstackclient, rtwo
 python-dateutil==2.6.0
 python-glanceclient==2.5.0  # via python-openstackclient, rtwo
-# python-irodsclient commented out until https://github.com/irods/python-irodsclient/pull/67 and https://github.com/cyverse/rtwo/pull/10 are merged
-# python-irodsclient==0.4.0  # via rtwo
+python-irodsclient==0.4.0  # via rtwo
 python-keystoneclient==3.6.0  # via django-cyverse-auth, python-glanceclient, python-openstackclient, rtwo
 python-ldap==2.4.19
 python-logstash==0.4.5
@@ -110,7 +108,7 @@ requestsexceptions==1.2.0  # via os-client-config
 rfc3986==0.4.1            # via oslo.config
 rfive==0.2.0              # via rtwo
 rsa==3.4.2                # via oauth2client
-rtwo==0.5.6
+rtwo==0.5.8
 simplejson==3.10.0        # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient
 six==1.10.0               # via cliff, cmd2, cryptography, debtcollector, djangorestframework-csv, keystoneauth1, oauth2client, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, packaging, pyopenssl, python-cinderclient, python-dateutil, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-swiftclient, setuptools, stevedore, warlock
 stevedore==1.21.0         # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient