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
base: c016e7f930a8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8d4248a4cb95
Choose a head ref
  • 10 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 9, 2018

  1. pythonPackages.pytest-timeout: refactor add python 2.7 compatibiliy

    In version 1.3.1 of `pytest-timeout` (latest) the setup.py file is not
    compatible with python 2.7 and 3+ due to how `open` is called. A patch
    has been added that can be removed once a fix and new relase is given.
    costrouc committed Aug 9, 2018
    Copy the full SHA
    7e192a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. pythonPackages.pytest-faulthandler: init at 1.5.0

     - compatible with 2.7 and 3+
     - all test pass.
    costrouc committed Sep 6, 2018
    Copy the full SHA
    5704642 View commit details
    Browse the repository at this point in the history
  2. pythonPackages.python-lz4: init at 2.1.0

    Fetching from github repository instead of pypi so that all tests can
    be run.
    
     - compatible with 2.7, 3+
     - all tests pass
    costrouc committed Sep 6, 2018
    Copy the full SHA
    3a56e31 View commit details
    Browse the repository at this point in the history
  3. pythonPackages.joblib: 0.12.1 -> 0.12.2

    In order to get all the tests passing the Github repository was
    downloaded instead of from pypi so that the `conftest.py` is
    available.
    
    In addition to updating the version:
    
      - compatible with 2.7, 3+ now
      - all tests are running and passing
    costrouc committed Sep 6, 2018
    Copy the full SHA
    05890dd View commit details
    Browse the repository at this point in the history
  4. pythonPackages.pytest-repeat: init at 0.6.0

     - compatible with 2.7, 3+
     - all tests pass and running
    costrouc committed Sep 6, 2018
    Copy the full SHA
    7b92017 View commit details
    Browse the repository at this point in the history
  5. pythonPackages.distributed: 1.15.1 -> 1.22.1

    The github repository was downloaded instead of the pypi repository
    for testing (needed `conftest.py`). Major work was done on the
    underlying dependencies to make distributed work on python 2.7,
    3+. Note that the test **do** take a significant amount of time (10-15
    minutes).
    
     - moved to `python-modules`
     - compatible with 2.7, 3+
     - all tests pass (previously tests were not run)
    costrouc committed Sep 6, 2018
    Copy the full SHA
    4f70170 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    ed13093 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2018

  1. merge: fixing changes with nixpkgs since pull-request

     - pytest-timeout: no longer requires patch
     - joblib: was improperly merged with the github merge tool (never
       using again)
    costrouc committed Sep 11, 2018
    Copy the full SHA
    dac171d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    027b9be View commit details
    Browse the repository at this point in the history
  3. Merge pull request #44657 from costrouc/costrouc/dask-distributed

    pythonPackages.distributed: 1.15.1 -> 1.22.1
    ryantm committed Sep 11, 2018
    Copy the full SHA
    8d4248a View commit details
    Browse the repository at this point in the history