JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112625 from fabaff/bump-pyfakefs

Browse Source
This commit is contained in:
Sandro 2021-02-17 04:11:14 +01:00 committed by GitHub
commit bbfa074098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 62 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/docplex/default.nix
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 = [

18
pkgs/development/python-modules/intelhex/default.nix
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";

30
pkgs/development/python-modules/pyfakefs/default.nix
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 ];
};
}

16
pkgs/development/python-modules/qiskit-aer/default.nix
View File

@ -6,6 +6,7 @@
, blas
, catch2
, cmake
, conan
, cython
, fmt
, muparserx
@ -27,7 +28,7 @@
buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.7.1";
version = "0.7.4";
disabled = pythonOlder "3.6";
@ -35,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y";
sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
};
nativeBuildInputs = [
@ -60,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;

63
pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch
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']

11
pkgs/development/python-modules/qiskit-aqua/default.nix
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 " \

6
pkgs/development/python-modules/qiskit-ignis/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "qiskit-ignis";
version = "0.5.1";
version = "0.5.2";
disabled = pythonOlder "3.6";
@ -32,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'"
'';

4
pkgs/development/python-modules/qiskit-terra/default.nix
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 ];

4
pkgs/development/python-modules/qiskit/default.nix
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 = [

20
pkgs/development/python-modules/solo-python/default.nix
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