Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e21b831f645
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15ac1b997f06
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 19, 2019

  1. python.pkgs.ws4py: enable for all Python versions 

    (cherry picked from commit ae5b836)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    5b2f46f View commit details

  2. python.pkgs.pyalgotrade: fix build 

    (cherry picked from commit 4cf0a12)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    15ac1b9 View commit details
Showing with 22 additions and 8 deletions.
  1. +18 −5 pkgs/development/python-modules/pyalgotrade/default.nix
  2. +4 −3 pkgs/development/python-modules/ws4py/default.nix
23 changes: 18 additions & 5 deletions pkgs/development/python-modules/pyalgotrade/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, matplotlib
, numpy
, scipy
, python-dateutil
, pytz
, requests
, retrying
, scipy
, six
, tornado
, tweepy
, ws4py
}:

buildPythonPackage rec {
pname = "pyalgotrade";
version = "0.20";
disabled = isPy3k;

src = fetchPypi {
inherit pname version;
pname = "PyAlgoTrade";
inherit version;
sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd";
};

propagatedBuildInputs = [ numpy scipy pytz ];
propagatedBuildInputs = [
matplotlib numpy python-dateutil pytz requests
retrying scipy six tornado tweepy ws4py
];

# no tests in PyPI tarball
doCheck = false;

meta = with stdenv.lib; {
description = "Python Algorithmic Trading";
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/ws4py/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git, asyncio
{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git
, cherrypy, gevent, tornado }:

buildPythonPackage rec {
@@ -11,15 +11,16 @@ buildPythonPackage rec {
};

checkInputs = [ pytest mock git ];
propagatedBuildInputs = [ asyncio cherrypy gevent tornado ];
propagatedBuildInputs = [ cherrypy gevent tornado ];

checkPhase = ''
pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered'
pytest
'';

meta = with stdenv.lib; {
homepage = https://ws4py.readthedocs.org;
description = "A WebSocket package for Python";
maintainers = with maintainers; [ rickynils ];
license = licenses.bsd3;
};
}