a54cd1c · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #91982 from drewrisinger/dr-pr-semver-bump

pythonPackages.semver: 2.8.1 -> 2.10.2

commita54cd1cace0d063393ff0e57d8555bc0c51ef441 authorBenjamin Hipple <bhipple@protonmail.com> dateThu 2 Jul 2020, 10:36 (6 years ago) parent498f3d8 4ab1c2b

3 files changed+21−18

compare with master

unifiedsplit

pkgs/development/python-modules/apache-airflow/default.nix+5−6 pkgs/development/python-modules/flask-appbuilder/default.nix+2−1 pkgs/development/python-modules/semver/default.nix+14−11

pkgs/development/python-modules/apache-airflow/default.nix+5−6

@@ -46,7 +46,6 @@

4646, thrift

4747, tzlocal

4848, unicodecsv

49−, werkzeug

5049, zope_deprecation

5150, enum34

5251, typing

@@ -127,7 +126,6 @@ buildPythonPackage rec {

127126 thrift

128127 tzlocal

129128 unicodecsv

130− werkzeug

131129 zope_deprecation

132130 ];

133131

@@ -143,24 +141,25 @@ buildPythonPackage rec {

143141 --replace "pandas>=0.17.1, <1.0.0" "pandas" \

144142 --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \

145143 --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \

144+ --replace "flask-admin==1.5.3" "flask-admin" \

145+ --replace "flask-login>=0.3, <0.5" "flask-login" \

146146 --replace "pendulum==1.4.4" "pendulum" \

147147 --replace "cached_property~=1.5" "cached_property" \

148148 --replace "dill>=0.2.2, <0.3" "dill" \

149149 --replace "configparser>=3.5.0, <3.6.0" "configparser" \

150− --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \

150+ --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \

151151 --replace "colorlog==4.0.2" "colorlog" \

152152 --replace "funcsigs==1.0.0" "funcsigs" \

153153 --replace "flask-swagger==0.2.13" "flask-swagger" \

154154 --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \

155− --replace "alembic>=0.9, <1.0" "alembic" \

155+ --replace "alembic>=1.0, <2.0" "alembic" \

156156 --replace "markdown>=2.5.2, <3.0" "markdown" \

157157 --replace "future>=0.16.0, <0.17" "future" \

158158 --replace "tenacity==4.12.0" "tenacity" \

159159 --replace "text-unidecode==1.2" "text-unidecode" \

160160 --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \

161161 --replace "sqlalchemy~=1.3" "sqlalchemy" \

162− --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \

163− --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"

162+ --replace "gunicorn>=19.5.0, <20.0" "gunicorn"

164163

165164 # dumb-init is only needed for CI and Docker, not relevant for NixOS.

166165 substituteInPlace setup.py \

pkgs/development/python-modules/flask-appbuilder/default.nix+2−1

@@ -66,7 +66,8 @@ buildPythonPackage rec {

6666 --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \

6767 --replace "PyJWT>=1.7.1" "PyJWT" \

6868 --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \

69− --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended"

69+ --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \

70+ --replace "Flask-Login>=0.3, <0.5" "Flask-Login"

7071 '';

7172

7273 # majority of tests require network access or mongo

pkgs/development/python-modules/semver/default.nix+14−11

@@ -1,24 +1,27 @@

1−{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:

1+{ stdenv

2+, fetchFromGitHub

3+, buildPythonPackage

4+, pytestCheckHook

5+, pytestcov

6+}:

3−buildPythonPackage {

8+buildPythonPackage rec {

49 pname = "semver";

5− version = "2.8.1";

10+ version = "2.10.2";

611

712 src = fetchFromGitHub {

8− owner = "k-bx";

13+ owner = "python-semver";

914 repo = "python-semver";

10− rev = "41775dd5f143dfa6ca94885056c9ef5b3ed4e6e1"; # not tagged in repository

11− sha256 = "1rqaakha4sw06k9h0h4g1wmk66zkmhpq92y2rw0kyfpp6xk1zbk2";

15+ rev = version;

16+ sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3";

1217 };

1318

14− checkInputs = [ pytest ];

15− checkPhase = ''

16− py.test

17− '';

19+ preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest

20+ checkInputs = [ pytestCheckHook pytestcov ];

1821

1922 meta = with stdenv.lib; {

2023 description = "Python package to work with Semantic Versioning (http://semver.org/)";

21− homepage = "https://github.com/k-bx/python-semver";

24+ homepage = "https://python-semver.readthedocs.io/en/latest/";

2225 license = licenses.bsd3;

2326 maintainers = with maintainers; [ np ];

2427 };