Commit Graph

58 Commits

Author SHA1 Message Date
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Thomas Watson
ce70bbbbd8 protobuf: pin to 3.17 for Python 2 2021-11-13 03:16:49 -05:00
github-actions[bot]
7414a16ee5
Merge master into staging-next 2021-11-09 18:01:23 +00:00
Henk Kalkwater
b982294b6f python2.7-filelock: Init version 3.2.1 for Python 2
This adds filelock 3.2.1, the last version that still supports Python 2.

This fixes nixops, as it still was dependent on filelock for Python 2.
See #145109.
2021-11-09 14:51:14 +01:00
Sandro Jäckel
b2767b69dd
python39Packages.ruamel-yaml: normalise name, adopt 2021-11-02 13:38:06 +01:00
Sandro Jäckel
e91d4957d0
python39Packages.ruamel-ordereddict: normalise name, adopt 2021-11-02 13:37:53 +01:00
Dmitry Kalinkin
412d572942
python3Packages.hg-git: init at 0.10.2 2021-10-25 13:46:56 -04:00
Sandro
b41a876d6e
Merge pull request #141750 from superherointj/python3-alias-jupyter-client 2021-10-21 21:56:31 +02:00
Maximilian Bosch
47fc40d5ab
pythonPackages.privacyidea-ldap-proxy: 0.6.1 -> 0.6.2, switch to python3 2021-10-18 21:14:35 +02:00
superherointj
206f3ab323 pythonPackages.jupyter_client: renamed to jupyter-client 2021-10-15 07:51:23 -03:00
Sandro Jäckel
e90e3c3bc4
python3Packages.pastescript: move to python3Packages 2021-10-07 21:32:48 +02:00
Tim Steinbach
d47e263f5c
nixops: Freeze Python2 dependencies 2021-09-16 09:39:22 -04:00
Martin Weinelt
c16fb103ba python2Packages.decorator: reinit at 4.4.2 2021-09-05 15:00:35 +02:00
Martin Weinelt
2522f92483 python2Packages.pluggy: reinit at 0.13.1 2021-09-05 14:59:02 +02:00
Martin Weinelt
dcba1d01db python2Packages.contextlib2: reinit at 0.6.0.post1 2021-09-05 14:59:02 +02:00
Frederik Rietdijk
8dcfe523f7
Merge pull request #131719 from FRidh/python2-to-3
Python: further migrate packages from 2 to 3
2021-07-29 10:49:00 +02:00
Frederik Rietdijk
afa9c4ae68 mlt: requires python3 2021-07-27 20:42:00 +02:00
Sandro Jäckel
183c7ebcae
pythonPackages: normalise prompt_toolkit 2021-07-23 16:36:39 +02:00
Sandro Jäckel
2e9c330216
pythonPackages: deprecate pytest_xdist alias 2021-07-21 13:32:52 +02:00
Sandro Jäckel
9bfdf57e13
pythonPackages: deprecate pytestrunner alias 2021-07-21 13:32:49 +02:00
Robert Schütz
ada27b88e2 python2Packages.certifi: init at 2019.11.28
We use the sources from 2019.11.28 to build, but inherit the cert bundle
from the maintained Python3-only version of certifi.

Co-authored-by: adisbladis <adisbladis@gmail.com>
2021-07-03 14:49:49 +02:00
github-actions[bot]
b68a0d2f5e
Merge master into staging-next 2021-06-23 18:04:30 +00:00
Sandro
f39a2230c3
Merge pull request #127834 from dotlambda/dnspython_1-drop 2021-06-23 17:55:42 +02:00
Martin Weinelt
65ddaf2db9
Merge pull request #127835 from dotlambda/hypothesis_4-drop 2021-06-23 15:28:49 +02:00
github-actions[bot]
b59d049598
Merge master into staging-next 2021-06-23 12:04:25 +00:00
Robert Schütz
d3ccac10d2 python2Packages.pg8000: init at 1.12.5 2021-06-23 00:05:05 +02:00
Robert Schütz
b4b4c2ab00 pythonPackages.hypothesis_4: drop
Versioned attributes in python-packages.nix should be avoided.
2021-06-22 23:47:19 +02:00
Robert Schütz
a68aefeb05 pythonPackages.dnspython_1: drop
Versioned attributes in python-packages.nix should be avoided.
2021-06-22 23:37:42 +02:00
Martin Weinelt
070e353e08 python2Packages.ruamel-yaml: reinit at 0.16.13 2021-06-22 13:42:51 +02:00
Martin Weinelt
2423806300
python2Packages.flask: reinit at 1.1.2 2021-06-21 16:48:39 -07:00
Martin Weinelt
1d623ad018
python2Packages.click. reinit at 7.1.2 2021-06-21 16:48:39 -07:00
Martin Weinelt
d8def3a0ab
python2Packages.werkzeug: reinit at 1.0.1 2021-06-21 16:48:38 -07:00
Martin Weinelt
6d0ed6486e
python2Packages.itsdangerous: reinit at 1.1.0 2021-06-21 16:48:38 -07:00
Martin Weinelt
78a54f4704
python2Packages.jinja2: reinit at 2.11.3 2021-06-21 16:48:38 -07:00
Martin Weinelt
8f0f982626
python2Packages.markupsafe: reinit at 1.1.1 2021-06-21 16:48:38 -07:00
Sandro Jäckel
89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm 2021-06-03 12:44:33 +02:00
DavHau
cd8f3e6c44 python3Packages.scikitlearn: rename to scikit-learn 2021-05-17 17:41:36 +07:00
Maximilian Bosch
67e49dbbb7
python2Packages.privacyidea-ldap-proxy: fix python2 build 2021-05-09 17:06:24 +02:00
Maximilian Bosch
5b29b74b71
python3Packages.privacyidea: fix eval with python3
While `privacyidea-ldap-proxy` only works on `python2`[1], `privacyidea`
itself works fine with `python3`, however it needs version one of
`pyjwt`[2], so I had to add `pyjwt1` which was already packaged for
`python2`[3] to the `python3` package-set. I think that's fine though
since `python2` should be only used when actually needed which isn't the
case here.

Closes #122250

[1] https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
[2] https://github.com/privacyidea/privacyidea/issues/2629
[3] bf9b6b1ef3
2021-05-09 16:19:35 +02:00
Martin Weinelt
bf9b6b1ef3 python2Packages.pyjwt: init at 1.7.1 2021-05-07 20:05:56 -07:00
Konstantin Alekseev
7ee53c0c4f python2Packages.importlib-resources: use version 3.3.1 for python2 2021-04-30 19:10:50 +02:00
Markus S. Wamser
b4167563e0 pythonPackages.trollius: remove
trollius is deprecated (by upstream) for more than five years,
all Python versions supported by trollius are end-of-life.
There are no more packages depending on trollius.
2021-04-30 09:43:26 +02:00
Evsyukov Denis
0052852109
python2-packages.nix: fix typo (#120784)
disablede to disabled
2021-04-26 22:50:06 +02:00
Robert Schütz
7f0e7c8586 python2Packages.pycairo: init at 1.18.2
Required for e.g. gimp.
2021-04-12 13:20:39 +02:00
Jan Tojnar
625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
Frederik Rietdijk
7b5b57f283 python2Packages.convertdate: fix attribute name 2021-04-03 17:56:14 +02:00
Frederik Rietdijk
f81c4edcd6 python2Packages.pytest-xdist: fix attribute name and alias 2021-04-03 17:56:14 +02:00
Frederik Rietdijk
959d1a4424 python2Packages.singledispatch: python 2 only 2021-04-03 17:56:14 +02:00
Frederik Rietdijk
24896293e4 python2Packages.scandir: python 2 only 2021-04-03 17:56:11 +02:00
Frederik Rietdijk
3904d4d477 python2Packages.typing: we no longer need it for Python 3 2021-04-03 17:49:55 +02:00