Unverified Commit 97ec1ab7 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

python3Packages.qcodes: 0.53.0 -> 0.54.4 (#481579)

parents 8ba64911 e2956586
Loading
Loading
Loading
Loading
+72 −54
Original line number Diff line number Diff line
@@ -2,56 +2,66 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch2,
  attrs,
  argon2-cffi,
  cbor2,

  # build-system
  cffi,
  hatchling,
  setuptools,

  # dependencies
  cryptography,
  flatbuffers,
  hyperlink,
  mock,
  msgpack,
  passlib,
  py-ubjson,
  pynacl,
  pygobject3,
  txaio,

  # optional-dependencies
  # compress
  python-snappy,
  # encryption
  base58,
  pyopenssl,
  qrcode,
  pytest-asyncio_0,
  python-snappy,
  pytestCheckHook,
  pythonOlder,
  service-identity,
  setuptools,
  twisted,
  txaio,
  # scram
  argon2-cffi,
  passlib,
  # serialization
  cbor2,
  flatbuffers,
  msgpack,
  ujson,
  py-ubjson,
  # twisted
  attrs,
  twisted,
  zope-interface,
  # ui
  pygobject3,

  # tests
  mock,
  pytest-asyncio_0,
  pytestCheckHook,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "autobahn";
  version = "24.4.2";
  version = "25.12.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "crossbario";
    repo = "autobahn-python";
    tag = "v${version}";
    hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-vSS7DpfGfNwQT8OsgEXJaP5J40QFIopdAD94/y7/jFY=";
  };

  patches = [
    (fetchpatch2 {
      # removal of broken pytest-asyncio markers
      url = "https://github.com/crossbario/autobahn-python/commit/7bc85b34e200640ab98a41cfddb38267f39bc92e.patch";
      hash = "sha256-JbuYWQhvjlXuHde8Z3ZSJAyrMOdIcE1GOq+Eh2HTz8c=";
    })
  build-system = [
    cffi
    hatchling
    setuptools
  ];

  build-system = [ setuptools ];

  dependencies = [
    cryptography
    hyperlink
@@ -59,29 +69,6 @@ buildPythonPackage rec {
    txaio
  ];

  nativeCheckInputs = [
    mock
    pytest-asyncio_0
    pytestCheckHook
  ]
  ++ optional-dependencies.scram
  ++ optional-dependencies.serialization;

  preCheck = ''
    # Run asyncio tests (requires twisted)
    export USE_ASYNCIO=1
  '';

  enabledTestPaths = [
    "./autobahn"
  ];

  disabledTestPaths = [
    "./autobahn/twisted"
  ];

  pythonImportsCheck = [ "autobahn" ];

  optional-dependencies = lib.fix (self: {
    all =
      self.accelerate
@@ -97,6 +84,8 @@ buildPythonPackage rec {
    ];
    compress = [ python-snappy ];
    encryption = [
      base58
      # ecdsa (marked as insecure)
      pynacl
      pyopenssl
      qrcode # pytrie
@@ -123,11 +112,40 @@ buildPythonPackage rec {
    ui = [ pygobject3 ];
  });

  pythonImportsCheck = [ "autobahn" ];

  nativeCheckInputs = [
    mock
    pytest-asyncio_0
    pytestCheckHook
  ]
  ++ finalAttrs.passthru.optional-dependencies.encryption
  ++ finalAttrs.passthru.optional-dependencies.scram
  ++ finalAttrs.passthru.optional-dependencies.serialization;

  preCheck = ''
    # Run asyncio tests (requires twisted)
    export USE_ASYNCIO=1
    rm src/autobahn/__init__.py
  '';

  enabledTestPaths = [
    "src/autobahn"
  ];

  disabledTestPaths = [
    "src/autobahn/twisted"

    # Requires insecure ecdsa library
    "src/autobahn/wamp/test/test_wamp_cryptosign.py"
  ];

  meta = {
    changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst";
    description = "WebSocket and WAMP in Python for Twisted and asyncio";
    homepage = "https://crossbar.io/autobahn";
    downloadPage = "https://github.com/crossbario/autobahn-python";
    changelog = "https://github.com/crossbario/autobahn-python/blob/${finalAttrs.src.tag}/docs/changelog.rst";
    license = lib.licenses.mit;
    maintainers = [ ];
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
  writableTmpDirAsHomeHook,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "qcodes-contrib-drivers";
  version = "0.23.0";
  pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "QCoDeS";
    repo = "Qcodes_contrib_drivers";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-m2idBaQl2OVhrY5hcLTeXY6BycGf0ufa/ySgxaU2L/4=";
  };

@@ -71,8 +71,8 @@ buildPythonPackage rec {
  meta = {
    description = "User contributed drivers for QCoDeS";
    homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers";
    changelog = "https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v${version}";
    changelog = "https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ evilmav ];
  };
}
})
+21 −14
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@
  h5netcdf,
  h5py,
  ipykernel,
  ipython,
  ipywidgets,
  jsonschema,
  libcst,
  matplotlib,
  networkx,
  numpy,
  opentelemetry-api,
  packaging,
@@ -32,12 +32,10 @@
  typing-extensions,
  uncertainties,
  websockets,
  wrapt,
  xarray,

  # optional-dependencies
  furo,
  jinja2,
  nbsphinx,
  pyvisa-sim,
  scipy,
@@ -59,21 +57,23 @@
  writableTmpDirAsHomeHook,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "qcodes";
  version = "0.53.0";
  version = "0.54.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "Qcodes";
    tag = "v${version}";
    hash = "sha256-uXVL25U7szJF/v7OEsB9Ww1h6ziBxsMJdqhZG5qn0VU=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-xiD/Iy/5FVadOc9/AxUbGgpOlyli2g6/hwpY1J3/urE=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail 'default-version = "0.0"' 'default-version = "${version}"'
      --replace-fail \
        'default-version = "0.54.0dev+Unknown"' \
        'default-version = "${finalAttrs.version}"'
  '';

  build-system = [
@@ -88,10 +88,10 @@ buildPythonPackage rec {
    h5netcdf
    h5py
    ipykernel
    ipython
    ipywidgets
    jsonschema
    matplotlib
    networkx
    numpy
    opentelemetry-api
    packaging
@@ -105,7 +105,6 @@ buildPythonPackage rec {
    typing-extensions
    uncertainties
    websockets
    wrapt
    xarray
  ];

@@ -113,7 +112,6 @@ buildPythonPackage rec {
    docs = [
      # autodocsumm
      furo
      jinja2
      nbsphinx
      pyvisa-sim
      # qcodes-loop
@@ -160,6 +158,13 @@ buildPythonPackage rec {
    "--hypothesis-profile ci"
    # Follow upstream with settings
    "--durations=20"

    # ERROR tests/test_interactive_widget.py - DeprecationWarning: Jupyter is migrating its paths to use standard platformdirs
    # given by the platformdirs library.  To remove this warning and
    # see the appropriate new directories, set the environment variable
    # `JUPYTER_PLATFORM_DIRS=1` and then run `jupyter --paths`.
    # The use of platformdirs will be the default in `jupyter_core` v6
    "-Wignore::DeprecationWarning"
  ];

  disabledTestPaths = [
@@ -200,10 +205,12 @@ buildPythonPackage rec {

  meta = {
    description = "Python-based data acquisition framework";
    changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/${src.tag}";
    changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/${finalAttrs.src.tag}";
    downloadPage = "https://github.com/QCoDeS/Qcodes";
    homepage = "https://qcodes.github.io/Qcodes/";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ evilmav ];
    maintainers = with lib.maintainers; [
      GaetanLepage
    ];
  };
}
})
+14 −30
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchPypi,
  mock,
  pytest-asyncio,
  fetchFromGitHub,
  hatchling,
  pytestCheckHook,
  twisted,
  zope-interface,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "txaio";
  version = "25.6.1";
  format = "setuptools";
  version = "25.12.2";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-2MA9yoI1Fcm8qSDfM1BJI65U8tq/R2zFqe1cwWke1oc=";
  src = fetchFromGitHub {
    owner = "crossbario";
    repo = "txaio";
    tag = "v${lib.replaceString "." "_" finalAttrs.version}";
    hash = "sha256-/vlkjSOlQYbRpjMySBzoSBSXm0yxWSHmzIF3ZfFIR64=";
  };

  propagatedBuildInputs = [
    twisted
    zope-interface
  build-system = [
    hatchling
  ];

  nativeCheckInputs = [
    mock
    pytest-asyncio
    pytestCheckHook
  ];

  disabledTests = [
    # No real value
    "test_sdist"
    # Some tests seems out-dated and require additional data
    "test_as_future"
    "test_errback"
    "test_create_future"
    "test_callback"
    "test_immediate_result"
    "test_cancel"
  ];

  pythonImportsCheck = [ "txaio" ];

  meta = {
    description = "Utilities to support code that runs unmodified on Twisted and asyncio";
    homepage = "https://github.com/crossbario/txaio";
    changelog = "https://github.com/crossbario/txaio/blob/v${version}/docs/releases.rst";
    changelog = "https://github.com/crossbario/txaio/blob/${finalAttrs.src.tag}/docs/releases.rst";
    license = lib.licenses.mit;
    maintainers = [ ];
  };
}
})