diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -52,22 +52,22 @@ self: super: { }; }; "atomicwrites" = super.buildPythonPackage { - name = "atomicwrites-1.1.5"; + name = "atomicwrites-1.2.1"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz"; - sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214"; + url = "https://files.pythonhosted.org/packages/ac/ed/a311712ef6b4355035489f665e63e1a73f9eb371929e3c98e5efd451069e/atomicwrites-1.2.1.tar.gz"; + sha256 = "1vmkbw9j0qammwxbxycrs39gvdg4lc2d4lk98kwf8ag2manyi6pc"; }; meta = { license = [ pkgs.lib.licenses.mit ]; }; }; "attrs" = super.buildPythonPackage { - name = "attrs-18.1.0"; + name = "attrs-18.2.0"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz"; - sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70"; + url = "https://files.pythonhosted.org/packages/0f/9e/26b1d194aab960063b266170e53c39f73ea0d0d3f5ce23313e0ec8ee9bdf/attrs-18.2.0.tar.gz"; + sha256 = "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -160,17 +160,6 @@ self: super: { license = [ pkgs.lib.licenses.asl20 ]; }; }; - "bottle" = super.buildPythonPackage { - name = "bottle-0.12.13"; - doCheck = false; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz"; - sha256 = "0m9k2a7yxvggc4kw8fsvj381vgsvfcdshg5nzy6vwrxiw2p53drr"; - }; - meta = { - license = [ pkgs.lib.licenses.mit ]; - }; - }; "bumpversion" = super.buildPythonPackage { name = "bumpversion-0.5.3"; doCheck = false; @@ -295,28 +284,14 @@ self: super: { }; }; "coverage" = super.buildPythonPackage { - name = "coverage-3.7.1"; + name = "coverage-4.5.1"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz"; - sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni"; + url = "https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-4.5.1.tar.gz"; + sha256 = "1wbrzpxka3xd4nmmkc6q0ir343d91kymwsm8pbmwa0d2a7q4ir2n"; }; meta = { - license = [ pkgs.lib.licenses.bsdOriginal ]; - }; - }; - "cprofilev" = super.buildPythonPackage { - name = "cprofilev-1.0.7"; - doCheck = false; - propagatedBuildInputs = [ - self."bottle" - ]; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz"; - sha256 = "0xwszfhxgndpcjkpq89dix6vi02hj1gzvhr7r716hd1x3y5p94c7"; - }; - meta = { - license = [ pkgs.lib.licenses.mit ]; + license = [ pkgs.lib.licenses.asl20 ]; }; }; "cssselect" = super.buildPythonPackage { @@ -372,11 +347,11 @@ self: super: { }; }; "dogpile.cache" = super.buildPythonPackage { - name = "dogpile.cache-0.6.6"; + name = "dogpile.cache-0.6.7"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/48/ca/604154d835c3668efb8a31bd979b0ea4bf39c2934a40ffecc0662296cb51/dogpile.cache-0.6.6.tar.gz"; - sha256 = "1h8n1lxd4l2qvahfkiinljkqz7pww7w3sgag0j8j9ixbl2h4wk84"; + url = "https://files.pythonhosted.org/packages/ee/bd/440da735a11c6087eed7cc8747fc4b995cbac2464168682f8ee1c8e43844/dogpile.cache-0.6.7.tar.gz"; + sha256 = "1aw8rx8vhb75y7zc6gi67g21sw057jdx7i8m3jq7kf3nqavxx9zw"; }; meta = { license = [ pkgs.lib.licenses.bsdOriginal ]; @@ -515,14 +490,14 @@ self: super: { }; }; "gevent" = super.buildPythonPackage { - name = "gevent-1.3.5"; + name = "gevent-1.3.6"; doCheck = false; propagatedBuildInputs = [ self."greenlet" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/e6/0a/fc345c6e6161f84484870dbcaa58e427c10bd9bdcd08a69bed3d6b398bf1/gevent-1.3.5.tar.gz"; - sha256 = "1w3gydxirgd2f60c5yv579w4903ds9s4g3587ik4jby97hgqc5bz"; + url = "https://files.pythonhosted.org/packages/49/13/aa4bb3640b5167fe58875d3d7e65390cdb14f9682a41a741a566bb560842/gevent-1.3.6.tar.gz"; + sha256 = "1ih4k73dqz2zb561hda99vbanja3m6cdch3mgxxn1mla3qwkqhbv"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -562,11 +537,11 @@ self: super: { }; }; "greenlet" = super.buildPythonPackage { - name = "greenlet-0.4.13"; + name = "greenlet-0.4.15"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz"; - sha256 = "1r412gfx25jrdiv444prmz5a8igrfabwnwqyr6b52ypq7ga87vqg"; + url = "https://files.pythonhosted.org/packages/f8/e8/b30ae23b45f69aa3f024b46064c0ac8e5fcb4f22ace0dca8d6f9c8bbe5e7/greenlet-0.4.15.tar.gz"; + sha256 = "1g4g1wwc472ds89zmqlpyan3fbnzpa8qm48z3z1y6mlk44z485ll"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1025,15 +1000,15 @@ self: super: { }; }; "pathlib2" = super.buildPythonPackage { - name = "pathlib2-2.3.0"; + name = "pathlib2-2.3.2"; doCheck = false; propagatedBuildInputs = [ self."six" self."scandir" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz"; - sha256 = "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk"; + url = "https://files.pythonhosted.org/packages/db/a8/7d6439c1aec525ed70810abee5b7d7f3aa35347f59bc28343e8f62019aa2/pathlib2-2.3.2.tar.gz"; + sha256 = "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1065,14 +1040,14 @@ self: super: { }; }; "pickleshare" = super.buildPythonPackage { - name = "pickleshare-0.7.4"; + name = "pickleshare-0.7.5"; doCheck = false; propagatedBuildInputs = [ self."pathlib2" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz"; - sha256 = "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4"; + url = "https://files.pythonhosted.org/packages/d8/b6/df3c1c9b616e9c0edbc4fbab6ddd09df9535849c64ba51fcb6531c32d4d8/pickleshare-0.7.5.tar.gz"; + sha256 = "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1108,11 +1083,11 @@ self: super: { }; }; "pluggy" = super.buildPythonPackage { - name = "pluggy-0.6.0"; + name = "pluggy-0.7.1"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz"; - sha256 = "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz"; + url = "https://files.pythonhosted.org/packages/a1/83/ef7d976c12d67a5c7a5bc2a47f0501c926cabae9d9fcfdc26d72abc9ba15/pluggy-0.7.1.tar.gz"; + sha256 = "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1134,22 +1109,22 @@ self: super: { }; }; "psutil" = super.buildPythonPackage { - name = "psutil-5.4.6"; + name = "psutil-5.4.7"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/51/9e/0f8f5423ce28c9109807024f7bdde776ed0b1161de20b408875de7e030c3/psutil-5.4.6.tar.gz"; - sha256 = "1xmw4qi6hnrhw81xqzkvmsm9im7j2vkk4v26ycjwq2jczqsmlvk8"; + url = "https://files.pythonhosted.org/packages/7d/9a/1e93d41708f8ed2b564395edfa3389f0fd6d567597401c2e5e2775118d8b/psutil-5.4.7.tar.gz"; + sha256 = "0fsgmvzwbdbszkwfnqhib8jcxm4w6zyhvlxlcda0rfm5cyqj4qsv"; }; meta = { license = [ pkgs.lib.licenses.bsdOriginal ]; }; }; "psycopg2" = super.buildPythonPackage { - name = "psycopg2-2.7.4"; + name = "psycopg2-2.7.5"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462/psycopg2-2.7.4.tar.gz"; - sha256 = "02b2yaf1hlwb91xkscbzmajpfj5z3d8yikzh5r48fs8gss8i3xcb"; + url = "https://files.pythonhosted.org/packages/b2/c1/7bf6c464e903ffc4f3f5907c389e5a4199666bf57f6cd6bf46c17912a1f9/psycopg2-2.7.5.tar.gz"; + sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc"; }; meta = { license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ]; @@ -1167,11 +1142,11 @@ self: super: { }; }; "py" = super.buildPythonPackage { - name = "py-1.5.3"; + name = "py-1.6.0"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/f7/84/b4c6e84672c4ceb94f727f3da8344037b62cee960d80e999b1cd9b832d83/py-1.5.3.tar.gz"; - sha256 = "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99"; + url = "https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz"; + sha256 = "1wcs3zv9wl5m5x7p16avqj2gsrviyb23yvc3pr330isqs0sh98q6"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1420,7 +1395,7 @@ self: super: { }; }; "pytest" = super.buildPythonPackage { - name = "pytest-3.6.0"; + name = "pytest-3.8.1"; doCheck = false; propagatedBuildInputs = [ self."py" @@ -1431,25 +1406,26 @@ self: super: { self."atomicwrites" self."pluggy" self."funcsigs" + self."pathlib2" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/67/6a/5bcdc22f8dbada1d2910d6e1a3a03f6b14306c78f81122890735b28be4bf/pytest-3.6.0.tar.gz"; - sha256 = "0bdfazvjjbxssqzyvkb3m2x2in7xv56ipr899l00s87k7815sm9r"; + url = "https://files.pythonhosted.org/packages/22/77/8dba15a7ec756b040e82bc216120d19dffb5f4a1e4f896822fd3a45bd0a8/pytest-3.8.1.tar.gz"; + sha256 = "0m6qn5kblnkc6qjhw8r8dga4gjii077ykn0a1d5131afzy49allm"; }; meta = { license = [ pkgs.lib.licenses.mit ]; }; }; "pytest-cov" = super.buildPythonPackage { - name = "pytest-cov-2.5.1"; + name = "pytest-cov-2.6.0"; doCheck = false; propagatedBuildInputs = [ self."pytest" self."coverage" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz"; - sha256 = "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3"; + url = "https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz"; + sha256 = "0qnpp9y3ygx4jk4pf5ad71fh2skbvnr6gl54m7rg5qysnx4g0q73"; }; meta = { license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ]; @@ -1498,14 +1474,14 @@ self: super: { }; }; "pytest-timeout" = super.buildPythonPackage { - name = "pytest-timeout-1.2.1"; + name = "pytest-timeout-1.3.2"; doCheck = false; propagatedBuildInputs = [ self."pytest" ]; src = fetchurl { - url = "https://files.pythonhosted.org/packages/be/e9/a9106b8bc87521c6813060f50f7d1fdc15665bc1bbbe71c0ffc1c571aaa2/pytest-timeout-1.2.1.tar.gz"; - sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8"; + url = "https://files.pythonhosted.org/packages/8c/3e/1b6a319d12ae7baa3acb7c18ff2c8630a09471a0319d43535c683b4d03eb/pytest-timeout-1.3.2.tar.gz"; + sha256 = "09wnmzvnls2mnsdz7x3c3sk2zdp6jl4dryvyj5i8hqz16q2zq5qi"; }; meta = { license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ]; @@ -1640,8 +1616,8 @@ self: super: { self."pytest-sugar" self."pytest-runner" self."pytest-profiling" + self."pytest-timeout" self."gprof2dot" - self."pytest-timeout" self."mock" self."webtest" self."cov-core" @@ -1722,7 +1698,6 @@ self: super: { self."repoze.lru" self."requests" self."routes" - self."setproctitle" self."simplejson" self."six" self."sqlalchemy" @@ -1756,10 +1731,9 @@ self: super: { self."greenlet" self."gunicorn" self."waitress" + self."setproctitle" self."ipdb" self."ipython" - self."cprofilev" - self."bottle" self."rhodecode-tools" self."appenlight-client" self."pytest" @@ -1768,8 +1742,8 @@ self: super: { self."pytest-sugar" self."pytest-runner" self."pytest-profiling" + self."pytest-timeout" self."gprof2dot" - self."pytest-timeout" self."mock" self."webtest" self."cov-core" @@ -1841,11 +1815,11 @@ self: super: { }; }; "setuptools" = super.buildPythonPackage { - name = "setuptools-40.4.1"; + name = "setuptools-40.4.3"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/c3/a8/a497f2f220fd51a714d0a466a32b8ec7d71dafbb053cb490a427b5fa2a1c/setuptools-40.4.1.zip"; - sha256 = "04cxymz28ahmkyb3m4v8042cdsprbafiw4yqphlcqffw3x610r85"; + url = "https://files.pythonhosted.org/packages/6e/9c/6a003320b00ef237f94aa74e4ad66c57a7618f6c79d67527136e2544b728/setuptools-40.4.3.zip"; + sha256 = "058v6zns4634n4al2nmmvp15j8nrgwn8wjrbdks47wk3vm05gg5c"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -1922,11 +1896,11 @@ self: super: { }; }; "subprocess32" = super.buildPythonPackage { - name = "subprocess32-3.5.1"; + name = "subprocess32-3.5.2"; doCheck = false; src = fetchurl { - url = "https://files.pythonhosted.org/packages/de/fb/fd3e91507021e2aecdb081d1b920082628d6b8869ead845e3e87b3d2e2ca/subprocess32-3.5.1.tar.gz"; - sha256 = "0wgi3bfnssid1g6h0v803z3k1wjal6il16nr3r9c587cfzwfkv0q"; + url = "https://files.pythonhosted.org/packages/c3/5f/7117737fc7114061837a4f51670d863dd7f7f9c762a6546fa8a0dcfe61c8/subprocess32-3.5.2.tar.gz"; + sha256 = "11v62shwmdys48g7ncs3a8jwwnkcl8d4zcwy6dk73z1zy2f9hazb"; }; meta = { license = [ pkgs.lib.licenses.psfl ]; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,8 @@ setuptools-scm==2.1.0 amqp==2.3.1 # not released authomatic that has updated some oauth providers https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1 -atomicwrites==1.1.5 -attrs==18.1.0 +atomicwrites==1.2.1 +attrs==18.2.0 babel==1.3 beaker==1.9.1 celery==4.1.1 @@ -19,7 +19,7 @@ cssselect==1.0.3 decorator==4.1.2 deform==2.0.5 docutils==0.14.0 -dogpile.cache==0.6.6 +dogpile.cache==0.6.7 dogpile.core==0.4.1 ecdsa==0.13 formencode==1.2.4 @@ -45,10 +45,10 @@ packaging==15.2 paste==2.0.3 pastedeploy==1.5.2 pastescript==2.0.2 -pathlib2==2.3.0 +pathlib2==2.3.2 peppercorn==0.5 -psutil==5.4.6 -psycopg2==2.7.4 +psutil==5.4.7 +psycopg2==2.7.5 py-bcrypt==0.4 pycrypto==2.6.1 pycurl==7.43.0.2 @@ -74,12 +74,11 @@ redis==2.10.6 repoze.lru==0.7 requests==2.9.1 routes==2.4.1 -setproctitle==1.1.10 simplejson==3.11.1 six==1.11.0 sqlalchemy==1.1.18 sshpubkeys==2.2.0 -subprocess32==3.5.1 +subprocess32==3.5.2 supervisor==3.3.4 tempita==0.5.2 translationstring==1.3 @@ -113,16 +112,15 @@ invoke==0.13.0 bumpversion==0.5.3 ## http servers -gevent==1.3.5 -greenlet==0.4.13 +gevent==1.3.6 +greenlet==0.4.15 gunicorn==19.9.0 waitress==1.1.0 +setproctitle==1.1.10 ## debug ipdb==0.11.0 ipython==5.1.0 -cprofilev==1.0.7 -bottle==0.12.13 ## rhodecode-tools, special case https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164#egg=rhodecode-tools==0.16.0 diff --git a/requirements_test.txt b/requirements_test.txt --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,14 +1,14 @@ # test related requirements -pytest==3.6.0 -py==1.5.3 -pytest-cov==2.5.1 +pytest==3.8.1 +py==1.6.0 +pytest-cov==2.6.0 pytest-sugar==0.9.1 pytest-runner==4.2.0 pytest-profiling==1.3.0 +pytest-timeout==1.3.2 gprof2dot==2017.9.19 -pytest-timeout==1.2.1 mock==1.0.1 webtest==2.0.29 cov-core==1.15.0 -coverage==3.7.1 +coverage==4.5.1