From c3ca0b75df93d8d7363b83aa50ce4191b759111a Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Fri, 25 Oct 2019 15:03:49 +0200 Subject: [PATCH 1/2] Remove debugging print statement --- src/pypi2nix/wheel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pypi2nix/wheel.py b/src/pypi2nix/wheel.py index c957896..0ef25a7 100644 --- a/src/pypi2nix/wheel.py +++ b/src/pypi2nix/wheel.py @@ -83,7 +83,6 @@ def from_wheel_directory_path( metadata_file, "r", encoding="ascii", errors="surrogateescape" ) as headers: metadata = email.parser.Parser().parse(headers) - print(metadata) license_string = str_from_message(metadata, "license") if license_string is None: license_string = "" From 75dc360a3b8e1362f9f7a3b1df32aa41257381dc Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Fri, 25 Oct 2019 15:27:12 +0200 Subject: [PATCH 2/2] Update development dependencies --- requirements.nix | 34 +++++++++++++++++----------------- requirements_frozen.txt | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.nix b/requirements.nix index acf9484..69c2b63 100644 --- a/requirements.nix +++ b/requirements.nix @@ -175,7 +175,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/chardet/chardet"; - license = licenses.lgpl3; + license = licenses.lgpl2; description = "Universal encoding detector for Python 2 and 3"; }; }; @@ -223,7 +223,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "http://docutils.sourceforge.net/"; - license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; + license = licenses.publicDomain; description = "Docutils -- Python Documentation Utilities"; }; }; @@ -260,7 +260,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/takluyver/entrypoints"; - license = "UNKNOWN"; + license = licenses.mit; description = "Discover and load entry points from installed packages."; }; }; @@ -359,7 +359,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/takluyver/flit"; - license = "UNKNOWN"; + license = licenses.bsdOriginal; description = "A simple packaging tool for simple packages."; }; }; @@ -397,7 +397,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "http://importlib-metadata.readthedocs.io/"; - license = "Apache Software License"; + license = licenses.asl20; description = "Read metadata from Python packages"; }; }; @@ -415,7 +415,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/takluyver/intreehooks"; - license = "UNKNOWN"; + license = licenses.mit; description = "Load a PEP 517 backend from inside the source tree"; }; }; @@ -449,7 +449,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://palletsprojects.com/p/jinja/"; - license = licenses.bsd3; + license = licenses.bsdOriginal; description = "A very fast and expressive template engine."; }; }; @@ -465,7 +465,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://palletsprojects.com/p/markupsafe/"; - license = licenses.bsd3; + license = licenses.bsdOriginal; description = "Safely add untrusted strings to HTML/XML markup."; }; }; @@ -573,7 +573,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/pypa/packaging"; - license = licenses.bsdOriginal; + license = licenses.asl20; description = "Core utilities for Python packages"; }; }; @@ -717,10 +717,10 @@ let }; "pytest" = python.mkDerivation { - name = "pytest-5.2.1"; + name = "pytest-5.2.2"; src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/3a/3b/f839b8431582e0f4e5f98230300db70b795f467503b2cdb0bf7eb9b18351/pytest-5.2.1.tar.gz"; - sha256 = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0"; + url = "https://files.pythonhosted.org/packages/24/67/051f7622814613980a03c9722233a4d7f8b0e21787a46b41a1057c903992/pytest-5.2.2.tar.gz"; + sha256 = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs ++ [ @@ -759,7 +759,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/pytest-dev/pytest-cov"; - license = licenses.mit; + license = licenses.bsdOriginal; description = "Pytest plugin for measuring coverage."; }; }; @@ -779,7 +779,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/pytest-dev/pytest-runner/"; - license = "UNKNOWN"; + license = licenses.mit; description = "Invoke py.test as distutils command with dependency resolution"; }; }; @@ -832,7 +832,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/pypa/setuptools"; - license = "UNKNOWN"; + license = licenses.mit; description = "Easily download, build, install, upgrade, and uninstall Python packages"; }; }; @@ -912,7 +912,7 @@ let propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/python/typing/blob/master/typing_extensions/README.rst"; - license = "PSF"; + license = licenses.psfl; description = "Backported and Experimental Type Hints for Python 3.5+"; }; }; @@ -998,7 +998,7 @@ let ]; meta = with pkgs.stdenv.lib; { homepage = "https://github.com/jaraco/zipp"; - license = "UNKNOWN"; + license = licenses.mit; description = "Backport of pathlib-compatible object wrapper for zip files"; }; }; diff --git a/requirements_frozen.txt b/requirements_frozen.txt index d6f775b..e4b72dc 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -34,7 +34,7 @@ pycodestyle==2.5.0 pyflakes==2.1.1 Pygments==2.4.2 pyparsing==2.4.2 -pytest==5.2.1 +pytest==5.2.2 pytest-cov==2.8.1 pytest-runner==5.1 pytoml==0.1.21