Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-17 06:14:47 +00:00
committed by GitHub
94 changed files with 777 additions and 649 deletions

View File

@@ -3,7 +3,6 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, freezegun
, google-api-core
, matplotlib

View File

@@ -46,11 +46,6 @@ buildPythonPackage rec {
ipython
];
postPatch = ''
substituteInPlace setup.py \
--replace "'numba==0.43'" "'numba'"
'';
# avoid collecting local files
preCheck = ''
cd clifford/test

View File

@@ -2,7 +2,6 @@
, fetchFromGitHub
, fetchpatch
, rPackages
, rWrapper
, buildPythonPackage
, biopython
, numpy
@@ -55,11 +54,6 @@ buildPythonPackage rec {
rPackages.DNAcopy
];
postPatch = ''
substituteInPlace setup.py \
--replace "pandas >= 0.20.1, < 0.25.0" "pandas"
'';
checkInputs = [ R ];
checkPhase = ''

View File

@@ -2,13 +2,12 @@
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytestrunner
, click
, dateparser
, pandas
, py-lru-cache
, six
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -23,11 +22,6 @@ buildPythonPackage rec {
sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4";
};
postPatch = ''
substituteInPlace setup.py \
--replace pandas~=0.25.0 pandas
'';
propagatedBuildInputs = [
click
dateparser
@@ -37,13 +31,9 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Convert CSV files into a SQLite database";
homepage = "https://github.com/simonw/csvs-to-sqlite";

View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
{ lib, buildPythonPackage, fetchPypi
, chart-studio
, colorlover
, ipython

View File

@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, dask
, numpy, toolz # dask[array]
, scipy
@@ -38,6 +37,7 @@ buildPythonPackage rec {
checkPhase = ''
pytest --ignore=tests/test_dask_image/
'';
pythonImportsCheck = [ "dask_image" ];
meta = with lib; {
homepage = "https://github.com/dask/dask-image";

View File

@@ -12,10 +12,6 @@
, six
, multipledispatch
, packaging
, pytest
, xgboost
, tensorflow
, joblib
, distributed
}:

View File

@@ -4,8 +4,6 @@
, dask
, distributed
, mpi4py
, pytest
, requests
}:
buildPythonPackage rec {
@@ -17,15 +15,11 @@ buildPythonPackage rec {
sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7";
};
checkInputs = [ pytest requests ];
propagatedBuildInputs = [ dask distributed mpi4py ];
checkPhase = ''
py.test dask_mpi
'';
# hardcoded mpirun path in tests
doCheck = false;
pythonImportsCheck = [ "dask_mpi" ];
meta = with lib; {
homepage = "https://github.com/dask/dask-mpi";

View File

@@ -4,8 +4,6 @@
, xgboost
, dask
, distributed
, pytest
, scikitlearn
}:
buildPythonPackage rec {
@@ -17,19 +15,17 @@ buildPythonPackage rec {
sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c";
};
checkInputs = [ pytest scikitlearn ];
propagatedBuildInputs = [ xgboost dask distributed ];
checkPhase = ''
py.test dask_xgboost/tests/test_core.py
'';
doCheck = false;
pythonImportsCheck = [ "dask_xdgboost" ];
meta = with lib; {
homepage = "https://github.com/dask/dask-xgboost";
description = "Interactions between Dask and XGBoost";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
# TypeError: __init__() got an unexpected keyword argument 'iid'
broken = true;
};
}

View File

@@ -78,7 +78,7 @@ buildPythonPackage rec {
# dask doesn't do well with large core counts
checkPhase = ''
pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array'
pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested'
'';
meta = with lib; {

View File

@@ -12,11 +12,7 @@
, lammps-cython
, pymatgen-lammps
, pytestrunner
, pytest
, pytestcov
, pytest-benchmark
, isPy3k
, openssh
}:
buildPythonPackage rec {
@@ -25,18 +21,27 @@ buildPythonPackage rec {
disabled = (!isPy3k);
src = fetchPypi {
inherit pname version;
sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df";
inherit pname version;
sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df";
};
buildInputs = [ pytestrunner ];
checkInputs = [ pytest pytestcov pytest-benchmark openssh ];
propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo
pandas scipy numpy scikitlearn
lammps-cython pymatgen-lammps ];
propagatedBuildInputs = [
pymatgen
marshmallow
pyyaml
pygmo
pandas
scipy
numpy
scikitlearn
lammps-cython
pymatgen-lammps
];
# tests require git lfs download. and is quite large so skip tests
doCheck = false;
pythonImportsCheck = [ "dftfit" ];
meta = {
description = "Ab-Initio Molecular Dynamics Potential Development";

View File

@@ -1,11 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, pytest-repeat
, pytest-timeout
, mock
, joblib
, click
, cloudpickle
, dask
@@ -18,9 +13,6 @@
, tornado
, zict
, pyyaml
, isPy3k
, futures
, singledispatch
, mpi4py
, bokeh
, pythonOlder
@@ -29,6 +21,7 @@
buildPythonPackage rec {
pname = "distributed";
version = "2.30.1";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests
src = fetchPypi {
@@ -36,23 +29,14 @@ buildPythonPackage rec {
sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
};
disabled = pythonOlder "3.6";
checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ];
propagatedBuildInputs = [
click cloudpickle dask msgpack psutil six
sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh
];
# tests take about 10-15 minutes
# ignore 5 cli tests out of 1000 total tests that fail due to subprocesses
# these tests are not critical to the library (only the cli)
checkPhase = ''
py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests"
'';
# when tested random tests would fail and not repeatably
doCheck = false;
pythonImportsCheck = [ "distributed" ];
meta = {
description = "Distributed computation in Python.";

View File

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
version = "2.19.202";
version = "2.20.204";
# No source available from official repo
src = fetchPypi {
inherit pname version;
sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b";
sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA=";
};
propagatedBuildInputs = [

View File

@@ -6,7 +6,7 @@
, pybind11
, setuptools_scm
, pytestrunner
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -31,18 +31,10 @@ buildPythonPackage rec {
pytestrunner
];
checkInputs = [
pytest
];
propagatedBuildInputs = [ numpy pandas ];
propagatedBuildInputs = [
numpy
pandas
];
checkPhase = ''
pytest
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "duckdb" ];
meta = with lib; {
description = "DuckDB is an embeddable SQL OLAP Database Management System";

View File

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner,
thrift, pytest, python-snappy, lz4, zstd }:
{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner
, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }:
buildPythonPackage rec {
pname = "fastparquet";
@@ -12,15 +12,13 @@ buildPythonPackage rec {
sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana";
};
postPatch = ''
# FIXME: package zstandard
# removing the test dependency for now
substituteInPlace setup.py --replace "'zstandard'," ""
'';
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numba numpy pandas thrift ];
checkInputs = [ pytest python-snappy lz4 zstd ];
checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ];
# E ModuleNotFoundError: No module named 'fastparquet.speedups'
doCheck = false;
pythonImportsCheck = [ "fastparquet" ];
meta = with lib; {
description = "A python implementation of the parquet format";

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy27
{ lib, buildPythonPackage, fetchPypi, isPy27
, numpy
, scipy
, tables

View File

@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, numpy
, setuptools
, python
, scikitimage
, openjpeg

View File

@@ -37,7 +37,7 @@ buildPythonPackage rec {
];
checkInputs = [ pytestCheckHook pytestcov ];
pytestFlagsArray = [ "tests" "--ignore=docs" ];
pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ];
disabledTests = [ "gridplot_outputs" ];
meta = with lib; {

View File

@@ -24,6 +24,7 @@ buildPythonPackage {
# tests cannot work without elasticsearch
doCheck = false;
pythonImportsCheck = [ "image_match" ];
meta = with lib; {
homepage = "https://github.com/ascribe/image-match";

View File

@@ -26,6 +26,9 @@ buildPythonPackage rec {
opencv3
];
doCheck = false;
pythonImportsCheck = [ "imagecorruptions" ];
meta = with lib; {
homepage = "https://github.com/bethgelab/imagecorruptions";
description = "This package provides a set of image corruptions";

View File

@@ -3,7 +3,6 @@
, pandas
, pytestCheckHook
, scikitlearn
, tensorflow
}:
buildPythonPackage rec {

View File

@@ -1,25 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "intelhex";
version = "2.2.1";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780";
sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM=";
};
patches = [
# patch the tests to check for the correct version string (2.2.1)
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch";
sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l";
})
];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "intelhex/test.py" ];
pythonImportsCheck = [ "intelhex" ];
meta = {
homepage = "https://github.com/bialix/intelhex";

View File

@@ -9,10 +9,7 @@
, pymatgen
, ase
, pytestrunner
, pytest_4
, pytestcov
, isPy3k
, openssh
}:
buildPythonPackage rec {
@@ -26,7 +23,6 @@ buildPythonPackage rec {
};
buildInputs = [ cython pytestrunner ];
checkInputs = [ pytest_4 pytestcov openssh ];
propagatedBuildInputs = [ mpi4py pymatgen ase numpy ];
preBuild = ''
@@ -44,6 +40,8 @@ buildPythonPackage rec {
EOF
'';
pythonImportsCheck = [ "lammps" ];
meta = {
description = "Pythonic Wrapper to LAMMPS using cython";
homepage = "https://gitlab.com/costrouc/lammps-cython";

View File

@@ -1,33 +1,41 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }:
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, libsodium
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "libnacl";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "saltstack";
repo = pname;
rev = "v${version}";
sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg";
sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc=";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ libsodium ];
buildInputs = [ libsodium ];
postPatch =
let soext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
'';
let soext = stdenv.hostPlatform.extensions.sharedLibrary; in
''
substituteInPlace "./libnacl/__init__.py" --replace \
"ctypes.cdll.LoadLibrary('libsodium${soext}')" \
"ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
'';
checkPhase = ''
py.test
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "libnacl" ];
meta = with lib; {
maintainers = with maintainers; [ xvapx ];
description = "Python bindings for libsodium based on ctypes";
homepage = "https://pypi.python.org/pypi/libnacl";
homepage = "https://libnacl.readthedocs.io/";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ xvapx ];
};
}

View File

@@ -35,6 +35,7 @@ buildPythonPackage rec {
# tests not included with pypi release
doCheck = false;
pythonImportsCheck = [ "nbsmoke" ];
meta = with lib; {
description = "Basic notebook checks and linting";

View File

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}:
, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}:
buildPythonPackage rec {
pname = "osmnx";
@@ -14,14 +14,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
checkInputs = [ coverage pytest coveralls ];
#Fails when using sandboxing as it requires internet connection, works fine without it
# requires network
doCheck = false;
#Check phase for the record
#checkPhase = ''
# coverage run --source osmnx -m pytest --verbose
#'';
pythonImportsCheck = [ "osmnx" ];
meta = with lib; {
description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX.";

View File

@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, isPy27
, pandas
, lxml

View File

@@ -23,6 +23,7 @@ buildPythonPackage rec {
# not everything packaged with pypi release
doCheck = false;
pythonImportsCheck = [ "pims" ];
meta = with lib; {
homepage = "https://github.com/soft-matter/pims";

View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:
let
_arrow-cpp = arrow-cpp.override { python3 = python; };

View File

@@ -1,7 +1,6 @@
{ buildPythonPackage
, lib
, fetchPypi
, isPy27
, click
, num2words
, numpy
@@ -11,8 +10,7 @@
, patsy
, bids-validator
, sqlalchemy
, pytest
, pathlib
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -36,11 +34,8 @@ buildPythonPackage rec {
sqlalchemy
];
checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ];
checkPhase = ''
pytest
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bids" ];
meta = with lib; {
description = "Python tools for querying and manipulating BIDS datasets";

View File

@@ -1,13 +1,19 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }:
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
version = "4.3.2";
version = "4.3.3";
pname = "pyfakefs";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070";
sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs=";
};
postPatch = ''
@@ -25,20 +31,16 @@ buildPythonPackage rec {
--replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
'');
checkInputs = [ pytest glibcLocales ];
checkPhase = ''
export LC_ALL=en_US.UTF-8
${python.interpreter} -m pyfakefs.tests.all_tests
${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages
${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py
'';
checkInputs = [ pytestCheckHook ];
# https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor)
disabledTests = [ "test_open_existing_pipe" ];
pythonImportsCheck = [ "pyfakefs" ];
meta = with lib; {
description = "Fake file system that mocks the Python file system modules";
license = licenses.asl20;
homepage = "http://pyfakefs.org/";
changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md";
homepage = "http://pyfakefs.org/";
changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md";
license = licenses.asl20;
maintainers = with maintainers; [ gebner ];
};
}

View File

@@ -10,20 +10,18 @@ buildPythonPackage rec {
sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0";
};
preConfigure = ''
export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
'';
buildInputs = [ fftw fftwFloat fftwLongDouble];
propagatedBuildInputs = [ numpy scipy cython dask ];
# Tests cannot import pyfftw. pyfftw works fine though.
doCheck = false;
preConfigure = ''
export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
'';
#+ optionalString isDarwin ''
# export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
#'';
pythonImportsCheck = [ "pyfftw" ];
meta = with lib; {
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";

View File

@@ -3,14 +3,14 @@
, buildPythonPackage
, pymatgen
, pytestrunner
, pytest
, pytestCheckHook
, isPy3k
}:
buildPythonPackage rec {
pname = "pymatgen-lammps";
version = "0.4.5";
disabled = (!isPy3k);
disabled = !isPy3k;
src = fetchurl {
url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
@@ -18,13 +18,17 @@ buildPythonPackage rec {
};
buildInputs = [ pytestrunner ];
checkInputs = [ pytest ];
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ pymatgen ];
pythonImportsCheck = [ "pmg_lammps" ];
meta = {
description = "A LAMMPS wrapper using pymatgen";
homepage = "https://gitlab.com/costrouc/pymatgen-lammps";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ costrouc ];
# not compatible with recent versions of pymatgen
broken = true;
};
}

View File

@@ -52,6 +52,7 @@ buildPythonPackage rec {
# No tests in pypi tarball.
doCheck = false;
pythonImportsCheck = [ "pymatgen" ];
meta = with lib; {
description = "A robust materials analysis code that defines core object representations for structures and molecules";

View File

@@ -17,10 +17,11 @@ buildPythonPackage rec {
sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa";
};
doCheck = false;
propagatedBuildInputs = [ requests lxml pandas ];
doCheck = false;
pythonImportsCheck = [ "pytrends" ];
meta = with lib; {
description = "Pseudo API for Google Trends";
homepage = "https://github.com/GeneralMills/pytrends";

View File

@@ -2,11 +2,11 @@
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
# C Inputs
, blas
, catch2
, cmake
, conan
, cython
, fmt
, muparserx
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.7.1";
version = "0.7.4";
disabled = pythonOlder "3.6";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y";
sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
};
nativeBuildInputs = [
@@ -61,10 +61,13 @@ buildPythonPackage rec {
pybind11
];
patches = [
# TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable
./remove-conan-install.patch
];
postPatch = ''
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
'';
preBuild = ''
export DISABLE_CONAN=1
'';
dontUseCmakeConfigure = true;

View File

@@ -1,63 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efeacfc..77bd6bd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,11 @@ endif()
# Looking for external libraries
#
-setup_conan()
+find_package(muparserx REQUIRED)
+find_package(nlohmann_json REQUIRED)
+find_package(spdlog REQUIRED)
+# for tests only
+find_package(catch2)
# If we do not set them with a space CMake fails afterwards if nothing is set for this vars!
set(AER_LINKER_FLAGS " ")
@@ -269,16 +273,16 @@ endif()
set(AER_LIBRARIES
${AER_LIBRARIES}
${BLAS_LIBRARIES}
- CONAN_PKG::nlohmann_json
+ nlohmann_json
Threads::Threads
- CONAN_PKG::spdlog
+ spdlog
${DL_LIB}
${THRUST_DEPENDANT_LIBS})
set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES})
# Cython build is only enabled if building through scikit-build.
if(SKBUILD) # Terra Addon build
- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx)
+ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx)
add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy)
add_subdirectory(qiskit/providers/aer/backends/wrappers)
add_subdirectory(src/open_pulse)
diff --git a/setup.py b/setup.py
index fd71e9f..1561cc4 100644
--- a/setup.py
+++ b/setup.py
@@ -11,12 +11,6 @@ import inspect
PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer')
-try:
- from conans import client
-except ImportError:
- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan'])
- from conans import client
-
try:
from skbuild import setup
except ImportError:
@@ -46,8 +40,6 @@ common_requirements = [
setup_requirements = common_requirements + [
'scikit-build',
- 'cmake!=3.17,!=3.17.0',
- 'conan>=1.22.2'
]
requirements = common_requirements + ['qiskit-terra>=0.12.0']

View File

@@ -34,7 +34,7 @@
buildPythonPackage rec {
pname = "qiskit-aqua";
version = "0.8.1";
version = "0.8.2";
disabled = pythonOlder "3.6";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aqua";
rev = version;
sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b";
sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw=";
};
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
@@ -73,13 +73,8 @@ buildPythonPackage rec {
# It can also be installed at runtime from the pip wheel.
# We disable appropriate tests below to allow building without pyscf installed
# NOTE: we remove cplex b/c we can't build pythonPackages.cplex.
# cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible
postPatch = ''
substituteInPlace setup.py \
--replace "pyscf; sys_platform != 'win32'" "" \
--replace "cplex; python_version >= '3.6' and python_version < '3.8'" ""
substituteInPlace setup.py --replace "docplex==2.15.194" "docplex"
# Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included
echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \

View File

@@ -2,7 +2,6 @@
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, python
, numpy
, qiskit-terra
@@ -24,7 +23,7 @@
buildPythonPackage rec {
pname = "qiskit-ignis";
version = "0.5.1";
version = "0.5.2";
disabled = pythonOlder "3.6";
@@ -33,11 +32,11 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-ignis";
rev = version;
sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y";
sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw=";
};
# hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.
# TODO: remove on qiskit-ignis v0.5.1
# TODO: remove on qiskit-ignis v0.5.2
postPatch = ''
substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'"
'';

View File

@@ -56,7 +56,7 @@ in
buildPythonPackage rec {
pname = "qiskit-terra";
version = "0.16.1";
version = "0.16.4";
disabled = pythonOlder "3.6";
@@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq";
sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc=";
};
nativeBuildInputs = [ cython ];

View File

@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.23.1";
version = "0.23.5";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1";
sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
};
propagatedBuildInputs = [

View File

@@ -46,6 +46,8 @@ buildPythonPackage rec {
importlib-metadata
];
pythonImportsCheck = [ "quandl" ];
meta = with lib; {
description = "Quandl Python client library";
homepage = "https://github.com/quandl/quandl-python";

View File

@@ -1,8 +1,6 @@
{ stdenv
, lib
, python
, buildPythonPackage
, fetchpatch
, fetchPypi
, isPyPy
, R

View File

@@ -32,12 +32,6 @@ buildPythonPackage rec {
checkInputs = [ coverage ];
propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ];
# remove on when version > 0.5.4
postPatch = ''
sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py
sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py
'';
# cython package not included for tests
doCheck = false;
@@ -45,6 +39,8 @@ buildPythonPackage rec {
${python.interpreter} -m skbio.test
'';
pythonImportsCheck = [ "skbio" ];
meta = with lib; {
homepage = "http://scikit-bio.org/";
description = "Data structures, algorithms and educational resources for bioinformatics";

View File

@@ -26,6 +26,7 @@ buildPythonPackage rec {
# Computationally very demanding tests
doCheck = false;
pythonImportsCheck= [ "seaborn" ];
meta = {
description = "Statisitical data visualization";

View File

@@ -26,10 +26,13 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ];
checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ];
# on CPU, these expect artifacts from previous GPU run
disabledTests = [
# on CPU, these expect artifacts from previous GPU run
"test_load_cuda_params_to_cpu"
# failing tests
"test_pickle_load"
"test_grid_search_with_slds_"
"test_grid_search_with_dict_works"
];
meta = with lib; {

View File

@@ -1,9 +1,20 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, click
, cryptography
, ecdsa
, fido2
, intelhex
, pyserial
, pyusb
, requests
}:
buildPythonPackage rec {
pname = "solo-python";
version = "0.0.26";
version = "0.0.27";
format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported
@@ -11,7 +22,7 @@
owner = "solokeys";
repo = pname;
rev = version;
sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz";
sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE=";
};
# replaced pinned fido, with unrestricted fido version
@@ -21,6 +32,7 @@
propagatedBuildInputs = [
click
cryptography
ecdsa
fido2
intelhex

View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
{ lib, buildPythonPackage, fetchPypi
, confluent-kafka
, distributed
, flaky

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k, callPackage
{ lib, buildPythonPackage, fetchPypi, isPy3k
, opencv3
, pyqt5
, pyqtgraph
@@ -19,7 +19,7 @@
, imageio-ffmpeg
, av
, nose
, pytest
, pytestCheckHook
, pyserial
, arrayqueues
, colorspacious
@@ -37,14 +37,18 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a";
};
doCheck = false;
# crashes python
preCheck = ''
rm stytra/tests/test_z_experiments.py
'';
checkInputs = [
nose
pytest
pytestCheckHook
pyserial
];
propagatedBuildInputs = [
opencv3
pyqt5

View File

@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytest
, pytestrunner
, pytestCheckHook
, pytorch
@@ -23,12 +22,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pytorch ];
checkInputs = [ pytest pytestrunner pytestCheckHook ];
disabledTests = [ "test_inplace_on_requires_grad" ];
# seems like a harmless failure:
## AssertionError:
## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.'
## does not match 'a leaf Variable that requires grad is being used in an in-place operation.'
checkInputs = [ pytestrunner pytestCheckHook ];
disabledTests = [
"test_inplace_on_requires_grad"
"test_input_requiring_grad"
];
meta = with lib; {
description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU";

View File

@@ -3,10 +3,9 @@
, fetchFromGitHub
, fetchpatch
, isPy27
, pytest
, pytestCheckHook
, nose
, numpy
, scipy
, pandas
, xarray
, traitlets
@@ -35,7 +34,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ traitlets ];
checkInputs = [ numpy pandas xarray nose pytest ];
checkInputs = [ numpy pandas xarray nose pytestCheckHook ];
pythonImportsCheck = [ "traittypes" ];
meta = with lib; {
description = "Trait types for NumPy, SciPy, XArray, and Pandas";

View File

@@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, typing-extensions
, requests
, yarl
}:
buildPythonPackage rec {
pname = "transmission-rpc";
version = "3.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7";
};
propagatedBuildInputs = [
six
typing-extensions
requests
yarl
];
# no tests
doCheck = false;
pythonImportsCheck = [ "transmission_rpc" ];
meta = with lib; {
description = "Python module that implements the Transmission bittorent client RPC protocol";
homepage = "https://pypi.python.org/project/transmission-rpc/";
license = licenses.mit;
maintainers = with maintainers; [ eyjhb ];
};
}

View File

@@ -1,26 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
}:
buildPythonPackage rec {
pname = "transmissionrpc";
version = "0.11";
src = fetchPypi {
inherit pname version;
sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60";
};
propagatedBuildInputs = [ six ];
# no tests
doCheck = false;
meta = with lib; {
description = "Python implementation of the Transmission bittorent client RPC protocol";
homepage = "https://pypi.python.org/pypi/transmissionrpc/";
license = licenses.mit;
};
}

View File

@@ -20,6 +20,7 @@ buildPythonPackage rec {
# No tests on PyPi
doCheck = false;
pythonImportsCheck = [ "uproot3_methods" ];
meta = with lib; {
homepage = "https://github.com/scikit-hep/uproot3-methods";

View File

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage , fetchPypi, pythonOlder
, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }:
, jupyter_core, pandas, ipywidgets, jupyter }:
buildPythonPackage rec {
pname = "vega";
@@ -11,12 +11,11 @@ buildPythonPackage rec {
sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d";
};
buildInputs = [ pytest ];
propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ];
# currently, recommonmark is broken on python3
doCheck = false;
checkInputs = [ altair ];
pythonImportsCheck = [ "vega" ];
meta = with lib; {
description = "An IPython/Jupyter widget for Vega and Vega-Lite";

View File

@@ -6,7 +6,6 @@
, imutils
, progress
, matplotlib
, pytest
}:
buildPythonPackage rec {
@@ -18,11 +17,11 @@ buildPythonPackage rec {
sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ];
# tests not packaged with pypi
doCheck = false;
pythonImportsCheck = [ "vidstab" ];
meta = with lib; {
homepage = "https://github.com/AdamSpannbauer/python_video_stab";