Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

opentimestamps: 0.2.1 -> 0.3.0, opentimestamps-client: 0.5.1 -> 0.6.0 #39599

Merged
merged 2 commits into from Apr 27, 2018
Merged

opentimestamps: 0.2.1 -> 0.3.0, opentimestamps-client: 0.5.1 -> 0.6.0 #39599

merged 2 commits into from Apr 27, 2018

Conversation

erikarvstedt
Copy link
Member

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
  • Tested execution of all binary files (usually in ./result/bin/)
  • [?] Fits CONTRIBUTING.md. ( --> I took the liberty to merge two version bumps into this single commit.)

dotlambda
dotlambda reviewed Apr 27, 2018
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer 2 seperate commits.

pkgs/development/python-modules/opentimestamps/default.nix Outdated
@@ -3,14 +3,14 @@

buildPythonPackage rec {
name = "opentimestamps-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please specify pname instead

pkgs/development/python-modules/opentimestamps/default.nix Outdated
@@ -3,14 +3,14 @@

buildPythonPackage rec {
name = "opentimestamps-${version}";
version = "0.2.1";
version = "0.3.0";
disabled = (!isPy3k);

src = fetchFromGitHub {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If possible, please use fetchPypi instead.

pkgs/tools/misc/opentimestamps-client/default.nix Outdated
@@ -1,19 +1,19 @@
{ lib, buildPythonApplication, fetchFromGitHub, isPy3k
, opentimestamps, GitPython, pysocks }:
, opentimestamps, appdirs, GitPython, pysocks }:

buildPythonApplication rec {
name = "opentimestamps-client-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pname

pkgs/tools/misc/opentimestamps-client/default.nix Outdated

buildPythonApplication rec {
name = "opentimestamps-client-${version}";
version = "0.5.1";
version = "0.6.0";
disabled = (!isPy3k);

src = fetchFromGitHub {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetchPypi

@erikarvstedt
Copy link
Member Author

I'v split the commits.

As mentioned in my introductory PR, we can't use pypi for this package. I've added some source comments to clarify this.

By the way, here's a usage example to help reviewing:

echo 'data to timestamp' | $(nix-build --no-out-link <dev-nixpkgs> -A opentimestamps-client)/bin/ots stamp

@dotlambda
Copy link
Member

You forgot to use pname instead of name. The latter will automatically be set to "${pname}-${version}" by buildPython*.

@erikarvstedt
Copy link
Member Author

erikarvstedt commented Apr 27, 2018 •
edited

Thanks for the hint.
There are so many python pkg definitions that explicitly define name = "${pname}-${version}" that I thought pname was just a convention when using pypi.
I could prepare a patch to remove all redunant name definitions. Would that be helpful?

@dotlambda
Copy link
Member

dotlambda commented Apr 27, 2018 •
edited

I could prepare a patch to remove all redunant name definitions. Would that be helpful?

I'm not sure it's necessary. There's no huge advantage in having no name, so I think it's okay to use it for new/updated packages only.
However, if you feel like doing a PR, don't hesitate.

Btw, I think the more important thing to do is moving all packages out of python-packages.nix.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.opentimestamps python3.pkgs.opentimestamps opentimestamps-client

@erikarvstedt You should prepend pythonPackages. to the message of your first commit.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python3.pkgs.opentimestamps, opentimestamps-client

The following builds were skipped because they don't evaluate on x86_64-linux: python2.pkgs.opentimestamps

Partial log (click to expand)

writing manifest file 'opentimestamps_client.egg-info/SOURCES.txt'
running build_ext
test_hash_signed_commit (otsclient.tests.test_git.TestGit) ... ok

----------------------------------------------------------------------
Ran 1 test in 0.122s

OK
/nix/store/4jvhqshlspp5miyq8srxj2znxixp6s2v-python3.6-opentimestamps-0.3.0
/nix/store/vlsa16jpj5an6if47k699ga3vnm9g58f-opentimestamps-client-0.6.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python3.pkgs.opentimestamps, opentimestamps-client

The following builds were skipped because they don't evaluate on aarch64-linux: python2.pkgs.opentimestamps

Partial log (click to expand)

writing manifest file 'opentimestamps_client.egg-info/SOURCES.txt'
running build_ext
test_hash_signed_commit (otsclient.tests.test_git.TestGit) ... ok

----------------------------------------------------------------------
Ran 1 test in 0.122s

OK
/nix/store/rr1sbmvmwjhb052skb7yi6g1w03gwpj5-python3.6-opentimestamps-0.3.0
/nix/store/ssdmh2shdd1g2ca6s8jhvymasz41kbzf-opentimestamps-client-0.6.0

@erikarvstedt
Copy link
Member Author

Fixed. Thanks for your patience!

@dotlambda dotlambda merged commit ac0ee0c into NixOS:master Apr 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda left review comments

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@erikarvstedt @dotlambda @GrahamcOfBorg