Add the python package 'us' and update 'jellyfish' #33334

idontgetoutmuch · 2018-01-02T16:41:24Z

Motivation for this change

It's a very useful package for doing analyses about the US

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

idontgetoutmuch · 2018-01-02T16:45:14Z

bash-3.2$ nix-shell -p python35Packages.jellyfish --run "python3" -I nixpkgs=/Users/dom/nixpkgs
Python 3.5.4 (default, Dec 22 2017, 19:58:24) 
[GCC 4.2.1 Compatible Clang 4.0.1 (tags/RELEASE_401/final)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> import pkg_resources
>>> pkg_resources.get_distribution("jellyfish").version
'0.5.6'

and

bash-3.2$ nix-env -f /Users/dom/nixpkgs -qaP -A python35Packages | grep -i jelly
python35Packages.jellyfish                             python3.5-jellyfish-0.5.6

but

bash-3.2$ nix-shell -p python35Packages.us --run "python3" -I nixpkgs=/Users/dom/nixpkgs
these derivations will be built:
  /nix/store/7h1a989qcms53njd417ysxq9s9wvsfxq-python3.5-us-1.0.0.drv
building path(s) ‘/nix/store/jfp0d1xw15xz9pb0f3k3hh21zz1xr7r0-python3.5-us-1.0.0’
unpacking sources
unpacking source archive /nix/store/zwxy4pf14pxdr78cdzaaas08b05m4j5i-us-1.0.0.tar.gz
source root is us-1.0.0
setting SOURCE_DATE_EPOCH to timestamp 1503347245 of file us-1.0.0/us.egg-info/SOURCES.txt
patching sources
configuring
building
running bdist_wheel
running build
running build_py
creating build
creating build/lib
creating build/lib/us
copying us/unitedstatesofamerica.py -> build/lib/us
copying us/__init__.py -> build/lib/us
copying us/states.py -> build/lib/us
creating build/lib/us/cli
copying us/cli/__init__.py -> build/lib/us/cli
copying us/cli/states.py -> build/lib/us/cli
running egg_info
writing us.egg-info/PKG-INFO
writing entry points to us.egg-info/entry_points.txt
writing dependency_links to us.egg-info/dependency_links.txt
writing requirements to us.egg-info/requires.txt
writing top-level names to us.egg-info/top_level.txt
reading manifest file 'us.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'us.egg-info/SOURCES.txt'
copying us/states.pkl -> build/lib/us
installing to build/bdist.macosx-10.6-x86_64/wheel
running install
running install_lib
creating build/bdist.macosx-10.6-x86_64
creating build/bdist.macosx-10.6-x86_64/wheel
creating build/bdist.macosx-10.6-x86_64/wheel/us
copying build/lib/us/unitedstatesofamerica.py -> build/bdist.macosx-10.6-x86_64/wheel/us
copying build/lib/us/states.pkl -> build/bdist.macosx-10.6-x86_64/wheel/us
copying build/lib/us/__init__.py -> build/bdist.macosx-10.6-x86_64/wheel/us
creating build/bdist.macosx-10.6-x86_64/wheel/us/cli
copying build/lib/us/cli/__init__.py -> build/bdist.macosx-10.6-x86_64/wheel/us/cli
copying build/lib/us/cli/states.py -> build/bdist.macosx-10.6-x86_64/wheel/us/cli
copying build/lib/us/states.py -> build/bdist.macosx-10.6-x86_64/wheel/us
running install_egg_info
Copying us.egg-info to build/bdist.macosx-10.6-x86_64/wheel/us-1.0.0-py3.5.egg-info
running install_scripts
creating build/bdist.macosx-10.6-x86_64/wheel/us-1.0.0.dist-info/WHEEL
creating '/private/tmp/nix-build-python3.5-us-1.0.0.drv-1/us-1.0.0/dist/us-1.0.0-py3-none-any.whl' and adding '.' to it
adding 'us/__init__.py'
adding 'us/states.pkl'
adding 'us/states.py'
adding 'us/unitedstatesofamerica.py'
adding 'us/cli/__init__.py'
adding 'us/cli/states.py'
adding 'us-1.0.0.dist-info/DESCRIPTION.rst'
adding 'us-1.0.0.dist-info/entry_points.txt'
adding 'us-1.0.0.dist-info/metadata.json'
adding 'us-1.0.0.dist-info/top_level.txt'
adding 'us-1.0.0.dist-info/WHEEL'
adding 'us-1.0.0.dist-info/METADATA'
adding 'us-1.0.0.dist-info/RECORD'
installing
/private/tmp/nix-build-python3.5-us-1.0.0.drv-1/us-1.0.0/dist /private/tmp/nix-build-python3.5-us-1.0.0.drv-1/us-1.0.0
Processing ./us-1.0.0-py3-none-any.whl
Collecting jellyfish==0.5.6 (from us==1.0.0)
  Could not find a version that satisfies the requirement jellyfish==0.5.6 (from us==1.0.0) (from versions: )
No matching distribution found for jellyfish==0.5.6 (from us==1.0.0)
builder for ‘/nix/store/7h1a989qcms53njd417ysxq9s9wvsfxq-python3.5-us-1.0.0.drv’ failed with exit code 1
error: build of ‘/nix/store/7h1a989qcms53njd417ysxq9s9wvsfxq-python3.5-us-1.0.0.drv’ failed
/nix/var/nix/profiles/default/bin/nix-shell: failed to build all dependencies

FRidh · 2018-01-02T16:57:45Z

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

+buildPythonPackage rec {
+  pname = "us";
+  version = "1.0.0";
+  name = "${pname}-${version}";


name line needs to be removed

FRidh · 2018-01-02T16:57:59Z

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

+  pname = "us";
+  version = "1.0.0";
+  name = "${pname}-${version}";
+  doCheck = !stdenv.isDarwin;


why not? Add a comment when disabling tests

I think I just copied an existing derivation - I will remove

FRidh · 2018-01-02T16:58:23Z

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

+{ lib
+, buildPythonPackage
+, fetchPypi
+, stdenv


stdenv is not used so drop it

FRidh · 2018-01-02T16:58:54Z

pkgs/top-level/python-packages.nix

@@ -9794,20 +9794,19 @@ in {
  jabberbot = callPackage ../development/python-modules/jabberbot {};

  jedi = callPackage ../development/python-modules/jedi { };
-
  jellyfish = buildPythonPackage rec {


jellyfish upgrade needs to be dropped from this PR because it is currently in the staging branch

@FRidh it seems that us requires jellyfish-0.5.6. Please advise.

I've just merged staging into master, so master has 0.5.6 in it. You can rebase on master.

Rebased just now

idontgetoutmuch · 2018-01-02T17:03:42Z

@GrahamcOfBorg @FRidh does this PR work for you because (see my comments above) I run into version issues. Here's the key error message

Collecting jellyfish==0.5.6 (from us==1.0.0)
  Could not find a version that satisfies the requirement jellyfish==0.5.6 (from us==1.0.0) (from versions: )
No matching distribution found for jellyfish==0.5.6 (from us==1.0.0)

FRidh · 2018-01-02T18:18:46Z

@idontgetoutmuch you've defined a function to build a Python package which has jellyfish. However, the function that builds the Python package (buildPythonPackage) needs to know that you want jellyfish to be a dependency. In this case, what is needed is propagatedBuildInputs = [ jellyfish ];.

idontgetoutmuch · 2018-01-04T09:06:55Z

I don't understand why there is a merge conflict since I rebased on master :(

idontgetoutmuch · 2018-01-04T09:18:44Z

I think rebasing again has made matters worse :(

idontgetoutmuch · 2018-01-04T10:35:31Z

I will submit a new PR at some point.

idontgetoutmuch added 4 commits December 26, 2017 16:23

Make stan point at the latest version

f60a33a

Merge branch 'master' of github.com:idontgetoutmuch/nixpkgs

2a2be05

Merge branch 'master' of https://github.com/NixOS/nixpkgs

52fbba5

An attempt at packaging the python package 'us'

8de024e

idontgetoutmuch requested a review from FRidh as a code owner January 2, 2018 16:41

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jan 2, 2018

FRidh self-assigned this Jan 2, 2018

FRidh requested changes Jan 2, 2018

View reviewed changes

FRidh added 2.status: work-in-progress 6.topic: python labels Jan 2, 2018

idontgetoutmuch added 5 commits January 4, 2018 08:49

Fix dependency

969804e

An attempt at packaging the python package 'us'

1cfc500

Fix dependency

9a9a760

Merge branch 'master' of github.com:idontgetoutmuch/nixpkgs

509233e

Typo

8e4fb52

idontgetoutmuch added 4 commits January 4, 2018 09:12

An attempt at packaging the python package 'us'

8bf253d

Fix dependency

1d93c09

Typo

a5fdc42

Merge branch 'master' of github.com:idontgetoutmuch/nixpkgs

6c74ea6

idontgetoutmuch closed this Jan 4, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add the python package 'us' and update 'jellyfish' #33334

Add the python package 'us' and update 'jellyfish' #33334

idontgetoutmuch commented Jan 2, 2018 •

edited

idontgetoutmuch commented Jan 2, 2018

FRidh Jan 2, 2018

idontgetoutmuch Jan 2, 2018

FRidh Jan 2, 2018

idontgetoutmuch Jan 2, 2018

FRidh Jan 2, 2018

idontgetoutmuch Jan 2, 2018

FRidh Jan 2, 2018

idontgetoutmuch Jan 2, 2018

FRidh Jan 2, 2018

idontgetoutmuch Jan 4, 2018

idontgetoutmuch commented Jan 2, 2018

FRidh commented Jan 2, 2018

idontgetoutmuch commented Jan 4, 2018

idontgetoutmuch commented Jan 4, 2018

idontgetoutmuch commented Jan 4, 2018

Add the python package 'us' and update 'jellyfish' #33334

Add the python package 'us' and update 'jellyfish' #33334

Conversation

idontgetoutmuch commented Jan 2, 2018 • edited

Motivation for this change

Things done

idontgetoutmuch commented Jan 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

idontgetoutmuch commented Jan 2, 2018

FRidh commented Jan 2, 2018

idontgetoutmuch commented Jan 4, 2018

idontgetoutmuch commented Jan 4, 2018

idontgetoutmuch commented Jan 4, 2018

idontgetoutmuch commented Jan 2, 2018 •

edited