friture: 0.37 -> unstable

This commit is contained in:
laikq 2020-07-20 18:09:40 +02:00 committed by Jon
parent d4b6ea979a
commit 1ee68120ce
2 changed files with 43 additions and 7 deletions

View File

@ -4,30 +4,32 @@ let
py = python3Packages; py = python3Packages;
in py.buildPythonApplication rec { in py.buildPythonApplication rec {
pname = "friture"; pname = "friture";
version = "0.37"; version = "unstable-2020-02-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tlecomte"; owner = "tlecomte";
repo = pname; repo = pname;
rev = "v${version}"; rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa";
sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y"; sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym";
}; };
# module imports scipy.misc.factorial, but it has been removed since scipy
# 1.3.0; use scipy.special.factorial instead
patches = [ ./factorial.patch ];
nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
[ wrapQtAppsHook ]; [ wrapQtAppsHook ];
propagatedBuildInputs = with py; [ propagatedBuildInputs = with py; [
sounddevice sounddevice
pyopengl pyopengl
pyopengl-accelerate
docutils docutils
numpy numpy
pyqt5 pyqt5
appdirs appdirs
pyrr pyrr
rtmixer
];
patches = [
./unlock_constraints.patch
]; ];
postFixup = '' postFixup = ''

View File

@ -0,0 +1,34 @@
diff --git a/setup.py b/setup.py
index f31eeec..ac0927b 100644
--- a/setup.py
+++ b/setup.py
@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv",
# these will be installed when calling 'pip install friture'
# they are also retrieved by 'requirements.txt'
install_requires = [
- "sounddevice==0.3.14",
- "rtmixer==0.1.0",
- "PyOpenGL==3.1.4",
- "PyOpenGL-accelerate==3.1.4",
- "docutils==0.15.2",
- "numpy==1.17.4",
- "PyQt5==5.13.2",
- "appdirs==1.4.3",
- "pyrr==0.10.3",
+ "sounddevice>=0.3.14",
+ "rtmixer>=0.1.0",
+ "PyOpenGL>=3.1.4",
+ "PyOpenGL-accelerate>=3.1.4",
+ "docutils>=0.15.2",
+ "numpy>=1.17.4",
+ "PyQt5>=5.13.2",
+ "appdirs>=1.4.3",
+ "pyrr>=0.10.3",
]
# Cython and numpy are needed when running setup.py, to build extensions
-setup_requires=["numpy==1.17.4", "Cython==0.29.14"]
+setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"]
with open(join(dirname(__file__), 'README.rst')) as f:
long_description = f.read()