Unverified Commit 7ec44014 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #320532 from GaetanLepage/qcodes 

python311Packages.qcodes: 0.44.1 -> 0.45.0
parents df9ddccf d61194ee

pkgs/development/python-modules/qcodes-contrib-drivers/default.nix

+21 −13
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  pythonOlder,

  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,

  setuptools,

  versioningit,

  cffi,

  qcodes,

  packaging,

  pandas,

  pytestCheckHook,

  pytest-mock,

  pyvisa-sim,

  stdenv,

}:



buildPythonPackage rec {

  pname = "qcodes-contrib-drivers";

  version = "0.21.0";

  version = "0.22.0";

  pyproject = true;



  disabled = pythonOlder "3.8";

  format = "pyproject";

  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "QCoDeS";

    repo = "Qcodes_contrib_drivers";

    rev = "refs/tags/v${version}";

    sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w=";

    sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY=";

  };



  nativeBuildInputs = [

  build-system = [

    setuptools

    versioningit

  ];



  propagatedBuildInputs = [

  dependencies = [

    cffi

    qcodes

    packaging

    pandas

  ];



  nativeCheckInputs = [
@@ -44,17 +49,20 @@ buildPythonPackage rec { 


  pythonImportsCheck = [ "qcodes_contrib_drivers" ];



  # should be fixed starting with 0.19.0, remove at next release

  disabledTestPaths = [ "qcodes_contrib_drivers/tests/test_Keysight_M3201A.py" ];

  disabledTests = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [

    # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29'

    "test_stability_diagram_external"

  ];



  postInstall = ''

    export HOME="$TMPDIR"

  '';



  meta = with lib; {

  meta = {

    description = "User contributed drivers for QCoDeS";

    homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers";

    license = licenses.mit;

    maintainers = with maintainers; [ evilmav ];

    changelog = "https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v${version}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ evilmav ];

  };

}

pkgs/development/python-modules/qcodes/default.nix

+71 −31
Original line number Diff line number Diff line 
{

  lib,

  broadbean,

  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,



  # build-system

  setuptools,

  versioningit,

  wheel,



  # dependencies

  broadbean,

  cf-xarray,

  dask,

  deepdiff,

  fetchFromGitHub,

  h5netcdf,

  h5py,

  hypothesis,

  importlib-metadata,

  ipykernel,

  ipython,

  ipywidgets,

  jsonschema,

  lxml,

  matplotlib,

  numpy,

  opencensus,

  opencensus-ext-azure,

  opentelemetry-api,

  packaging,

  pandas,

  pillow,

  pip,

  pytest-asyncio,

  pytest-mock,

  pytest-rerunfailures,

  pytest-xdist,

  pytestCheckHook,

  pythonOlder,

  pyarrow,

  pyvisa,

  pyvisa-sim,

  rsa,

  ruamel-yaml,

  setuptools,

  sphinx,

  tabulate,

  tqdm,

  typing-extensions,

  uncertainties,

  versioningit,

  websockets,

  wheel,

  wrapt,

  xarray,

  importlib-metadata,



  # optional-dependencies

  jinja2,

  nbsphinx,

  pyvisa-sim,

  scipy,

  sphinx,

  sphinx-issues,

  sphinx-rtd-theme,

  towncrier,

  opencensus,

  opencensus-ext-azure,



  # checks

  deepdiff,

  hypothesis,

  lxml,

  pip,

  pytest-asyncio,

  pytest-mock,

  pytest-rerunfailures,

  pytest-xdist,

  pytestCheckHook,

}:



buildPythonPackage rec {

  pname = "qcodes";

  version = "0.44.1";

  version = "0.45.0";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -58,16 +72,16 @@ buildPythonPackage rec { 
    owner = "microsoft";

    repo = "Qcodes";

    rev = "refs/tags/v${version}";

    hash = "sha256-AggAVq/yfJUZRwoQb29QoIbVIAdV3solKCjivqucLZk=";

    hash = "sha256-H91CpvxGQW0X+m/jlqXMc1RdI9w62lt5jgYOxZ2iPQg=";

  };



  nativeBuildInputs = [

  build-system = [

    setuptools

    versioningit

    wheel

  ];



  propagatedBuildInputs = [

  dependencies = [

    broadbean

    cf-xarray

    dask
@@ -79,14 +93,12 @@ buildPythonPackage rec { 
    jsonschema

    matplotlib

    numpy

    opencensus

    opencensus-ext-azure

    opentelemetry-api

    packaging

    pandas

    pillow

    pyarrow

    pyvisa

    rsa

    ruamel-yaml

    tabulate

    tqdm
@@ -97,6 +109,34 @@ buildPythonPackage rec { 
    xarray

  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];



  optional-dependencies = {

    docs = [

      # autodocsumm

      jinja2

      nbsphinx

      pyvisa-sim

      # qcodes-loop

      scipy

      sphinx

      # sphinx-favicon

      sphinx-issues

      # sphinx-jsonschema

      sphinx-rtd-theme

      # sphinxcontrib-towncrier

      towncrier

    ];

    loop = [

      # qcodes-loop

    ];

    opencensus = [

      opencensus

      opencensus-ext-azure

    ];

    zurichinstruments = [

      # zhinst-qcodes

    ];

  };



  nativeCheckInputs = [

    deepdiff

    hypothesis
@@ -160,12 +200,12 @@ buildPythonPackage rec { 
    export HOME="$TMPDIR"

  '';



  meta = with lib; {

  meta = {

    description = "Python-based data acquisition framework";

    changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}";

    downloadPage = "https://github.com/QCoDeS/Qcodes";

    homepage = "https://qcodes.github.io/Qcodes/";

    license = licenses.mit;

    maintainers = with maintainers; [ evilmav ];

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ evilmav ];

  };

}