From 7af8ecc7db72f83b93d6c457013b514b3a8b2e06 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Fri, 26 Apr 2019 14:39:01 +0100 Subject: [PATCH 1/2] Updated cx_freeze version --- requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3dd4228ff..617e004ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,10 @@ pytest==4.3.0 pytest-cov==2.6.1 h5py==2.8.0 flake8==3.5.0 -cx_Freeze==5.1.1 + +# cx_Freeze is used for packaging, the pypi version does not have a fix for Python 3.7 on Windows 10 (https://github.com/anthony-tuininga/cx_Freeze/issues/407) +git+https://github.com/anthony-tuininga/cx_Freeze.git@master + git+https://github.com/ess-dmsc/python-nexus-utilities@6f5d2c7f1ca66063227aad2a111a2cc567d573f6#egg=nexusutils jsonschema==2.6.0 numpy-stl==2.7.0 From 522f63072938afe38a280c14cf01a267eb856dae Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Fri, 26 Apr 2019 14:45:28 +0100 Subject: [PATCH 2/2] Moved off of pinned versions --- requirements.txt | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 617e004ba..d26ec5c18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,18 @@ -attrs==18.2.0 -PySide2==5.12.2 -pytest==4.3.0 -pytest-cov==2.6.1 -h5py==2.8.0 -flake8==3.5.0 +# In general libraries should not be pinned to specific versions +attrs +pytest +pytest-cov +h5py +flake8 +git+https://github.com/ess-dmsc/python-nexus-utilities@6f5d2c7f1ca66063227aad2a111a2cc567d573f6#egg=nexusutils +jsonschema +numpy-stl +pre-commit +pint # cx_Freeze is used for packaging, the pypi version does not have a fix for Python 3.7 on Windows 10 (https://github.com/anthony-tuininga/cx_Freeze/issues/407) git+https://github.com/anthony-tuininga/cx_Freeze.git@master -git+https://github.com/ess-dmsc/python-nexus-utilities@6f5d2c7f1ca66063227aad2a111a2cc567d573f6#egg=nexusutils -jsonschema==2.6.0 -numpy-stl==2.7.0 -pre-commit -pint +# PySide2 has had some issues with new versions and packaging so we will pin it +PySide2==5.12.2 +