diff --git a/.gitignore b/.gitignore index 7e7aab5a..e7be4855 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ /src/.setup_doc_virtualenv /src/java/target/ /src/java/src/main/java/com/dnanexus/DXToolkitVersion.java -/src/python/dxpy/toolkit_version.py /src/python/coverage-reports/ /src/R/install_dxR_deps.Rout /src/R/dxR*.tar.gz diff --git a/src/python/dxpy/toolkit_version.py b/src/python/dxpy/toolkit_version.py new file mode 100644 index 00000000..2f546186 --- /dev/null +++ b/src/python/dxpy/toolkit_version.py @@ -0,0 +1 @@ +version = '0.218.0' diff --git a/src/python/requirements.txt b/src/python/requirements.txt index cfe3e3b6..fd12e9a5 100644 --- a/src/python/requirements.txt +++ b/src/python/requirements.txt @@ -4,4 +4,7 @@ python-magic==0.4.6 beautifulsoup4==4.4.1 psutil>=3.3.0 requests>=2.8.0 -cryptography<=2.2.2 +# cryptography<=2.2.2 +# Needed for compiling against libressl +# https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#23---2018-07-18 +cryptography<=2.3.1 diff --git a/src/python/setup.py b/src/python/setup.py index 4aca1f85..056fffde 100755 --- a/src/python/setup.py +++ b/src/python/setup.py @@ -64,7 +64,15 @@ dependencies.extend(backports_dependencies) # dxfs is not compatible with Windows, and is currently disabled on Python 3 if platform.system() != 'Windows': - dependencies.extend(dxfs_dependencies) + # dependencies.extend(dxfs_dependencies) + print 'Skipping installation of dxfs dependencies!' + print '' + print 'SolveBio deploys on the Alpine Linux distribution, which does ' + print 'not appear to be compatible with the xattrs (extended attributes) ' + print 'package, which dxpy utilizes to provide a virtual filesystem on ' + print 'the guest host. Since SolveBio does not use this functionality of ' + print 'dxpy, it is believed safe to proceed without it.' + print '' if 'DNANEXUS_INSTALL_PYTHON_TEST_DEPS' in os.environ: dependencies.extend(test_dependencies)