summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorJoão Figueira <jmc.figueira@campus.fct.unl.pt>2022-01-24 01:33:13 +0000
committerGitHub <noreply@github.com>2022-01-24 01:33:13 +0000
commitae10fad86b2d7a357825c19a563dd5dac60a67da (patch)
treea2bde77769ba6055989c27aaf1ac7287ad56d640 /pkgs/development/python-modules
parent0ac894e7d1d91e32fdcdc901229f16f27f321374 (diff)
parent8dbc4efd40169a8e3e57375b08d78205e5f83ff0 (diff)
Merge branch 'master' into wine-wayland
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/APScheduler/default.nix54
-rw-r--r--pkgs/development/python-modules/GitPython/default.nix4
-rw-r--r--pkgs/development/python-modules/Pygments/2_5.nix37
-rw-r--r--pkgs/development/python-modules/TurboCheetah/default.nix26
-rw-r--r--pkgs/development/python-modules/adafruit-platformdetect/default.nix4
-rw-r--r--pkgs/development/python-modules/adb-shell/default.nix16
-rw-r--r--pkgs/development/python-modules/adjusttext/default.nix4
-rw-r--r--pkgs/development/python-modules/aenum/default.nix4
-rw-r--r--pkgs/development/python-modules/afdko/default.nix2
-rw-r--r--pkgs/development/python-modules/afsapi/default.nix15
-rw-r--r--pkgs/development/python-modules/ailment/default.nix11
-rw-r--r--pkgs/development/python-modules/aioapns/default.nix4
-rw-r--r--pkgs/development/python-modules/aioconsole/default.nix12
-rw-r--r--pkgs/development/python-modules/aiocurrencylayer/default.nix4
-rw-r--r--pkgs/development/python-modules/aiogithubapi/default.nix23
-rw-r--r--pkgs/development/python-modules/aioharmony/default.nix4
-rw-r--r--pkgs/development/python-modules/aiohomekit/default.nix4
-rw-r--r--pkgs/development/python-modules/aiohttp-apispec/unstable.nix37
-rw-r--r--pkgs/development/python-modules/aiohttp-retry/default.nix43
-rw-r--r--pkgs/development/python-modules/aiohttp-socks/default.nix2
-rw-r--r--pkgs/development/python-modules/aiohwenergy/default.nix4
-rw-r--r--pkgs/development/python-modules/aioitertools/default.nix11
-rw-r--r--pkgs/development/python-modules/aiopvpc/default.nix3
-rw-r--r--pkgs/development/python-modules/aioresponses/default.nix10
-rw-r--r--pkgs/development/python-modules/aioridwell/default.nix4
-rw-r--r--pkgs/development/python-modules/aiorun/default.nix11
-rw-r--r--pkgs/development/python-modules/aioshelly/default.nix4
-rw-r--r--pkgs/development/python-modules/aioswitcher/default.nix4
-rw-r--r--pkgs/development/python-modules/alot/default.nix71
-rw-r--r--pkgs/development/python-modules/amaranth-boards/default.nix38
-rw-r--r--pkgs/development/python-modules/amaranth-soc/default.nix35
-rw-r--r--pkgs/development/python-modules/amaranth/default.nix (renamed from pkgs/development/python-modules/nmigen/default.nix)22
-rw-r--r--pkgs/development/python-modules/amqp/default.nix36
-rw-r--r--pkgs/development/python-modules/amqtt/default.nix36
-rw-r--r--pkgs/development/python-modules/angr/default.nix19
-rw-r--r--pkgs/development/python-modules/angrcli/default.nix2
-rw-r--r--pkgs/development/python-modules/angrop/default.nix11
-rw-r--r--pkgs/development/python-modules/annexremote/default.nix26
-rw-r--r--pkgs/development/python-modules/ansible-lint/default.nix4
-rw-r--r--pkgs/development/python-modules/ansimarkup/default.nix31
-rw-r--r--pkgs/development/python-modules/apache-airflow/default.nix64
-rw-r--r--pkgs/development/python-modules/apache-beam/default.nix145
-rw-r--r--pkgs/development/python-modules/apache-beam/fix-cython.patch41
-rw-r--r--pkgs/development/python-modules/apache-beam/relax-deps.patch20
-rw-r--r--pkgs/development/python-modules/apispec/3.nix47
-rw-r--r--pkgs/development/python-modules/apptools/default.nix38
-rw-r--r--pkgs/development/python-modules/archinfo/default.nix12
-rw-r--r--pkgs/development/python-modules/asgineer/default.nix32
-rw-r--r--pkgs/development/python-modules/aspell-python/default.nix44
-rw-r--r--pkgs/development/python-modules/asteval/default.nix4
-rw-r--r--pkgs/development/python-modules/astropy-extension-helpers/default.nix8
-rwxr-xr-xpkgs/development/python-modules/atlassian-python-api/default.nix4
-rw-r--r--pkgs/development/python-modules/attrdict/default.nix43
-rw-r--r--pkgs/development/python-modules/aws-xray-sdk/default.nix4
-rw-r--r--pkgs/development/python-modules/awscrt/default.nix4
-rw-r--r--pkgs/development/python-modules/awsiotpythonsdk/default.nix15
-rw-r--r--pkgs/development/python-modules/azure-core/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-eventhub/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-compute/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-datafactory/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix18
-rw-r--r--pkgs/development/python-modules/azure-mgmt-netapp/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-subscription/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-web/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-servicebus/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-servicefabric/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-synapse-artifacts/default.nix4
-rw-r--r--pkgs/development/python-modules/backports-entry-points-selectable/default.nix4
-rw-r--r--pkgs/development/python-modules/batchgenerators/default.nix46
-rw-r--r--pkgs/development/python-modules/bbox/default.nix30
-rw-r--r--pkgs/development/python-modules/bibtexparser/default.nix44
-rw-r--r--pkgs/development/python-modules/billiard/default.nix13
-rw-r--r--pkgs/development/python-modules/bimmer-connected/default.nix4
-rw-r--r--pkgs/development/python-modules/bitarray/default.nix4
-rw-r--r--pkgs/development/python-modules/bleak/default.nix4
-rw-r--r--pkgs/development/python-modules/blist/default.nix39
-rw-r--r--pkgs/development/python-modules/boltons/default.nix35
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/2.nix66
-rw-r--r--pkgs/development/python-modules/boto3/1_17.nix50
-rw-r--r--pkgs/development/python-modules/boto3/default.nix4
-rw-r--r--pkgs/development/python-modules/botocore/1_20.nix48
-rw-r--r--pkgs/development/python-modules/botocore/default.nix4
-rw-r--r--pkgs/development/python-modules/boxx/default.nix57
-rw-r--r--pkgs/development/python-modules/bpycv/bpycv-test.py76
-rw-r--r--pkgs/development/python-modules/bpycv/default.nix62
-rw-r--r--pkgs/development/python-modules/bsblan/default.nix12
-rw-r--r--pkgs/development/python-modules/build/default.nix2
-rw-r--r--pkgs/development/python-modules/cairocffi/default.nix67
-rw-r--r--pkgs/development/python-modules/cairocffi/generic.nix63
-rw-r--r--pkgs/development/python-modules/can/default.nix80
-rw-r--r--pkgs/development/python-modules/canmatrix/default.nix4
-rw-r--r--pkgs/development/python-modules/cart/default.nix2
-rw-r--r--pkgs/development/python-modules/case/default.nix28
-rw-r--r--pkgs/development/python-modules/catalogue/default.nix18
-rw-r--r--pkgs/development/python-modules/celery/default.nix13
-rw-r--r--pkgs/development/python-modules/censys/default.nix7
-rw-r--r--pkgs/development/python-modules/cepa/default.nix32
-rw-r--r--pkgs/development/python-modules/certifi/python2.nix34
-rw-r--r--pkgs/development/python-modules/cfn-lint/default.nix4
-rw-r--r--pkgs/development/python-modules/chardet/2.nix29
-rw-r--r--pkgs/development/python-modules/chart-studio/default.nix4
-rw-r--r--pkgs/development/python-modules/cheetah/default.nix33
-rw-r--r--pkgs/development/python-modules/cherrypy/default.nix106
-rw-r--r--pkgs/development/python-modules/chiabip158/default.nix4
-rw-r--r--pkgs/development/python-modules/chiapos/default.nix6
-rw-r--r--pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch12
-rw-r--r--pkgs/development/python-modules/chiavdf/default.nix4
-rw-r--r--pkgs/development/python-modules/cirq-google/default.nix7
-rw-r--r--pkgs/development/python-modules/cirq-rigetti/default.nix4
-rw-r--r--pkgs/development/python-modules/cjson/default.nix18
-rw-r--r--pkgs/development/python-modules/ckcc-protocol/default.nix4
-rw-r--r--pkgs/development/python-modules/claripy/default.nix21
-rw-r--r--pkgs/development/python-modules/cle/default.nix6
-rw-r--r--pkgs/development/python-modules/cli-helpers/default.nix4
-rw-r--r--pkgs/development/python-modules/click/7.nix28
-rw-r--r--pkgs/development/python-modules/clize/default.nix5
-rw-r--r--pkgs/development/python-modules/cloudsplaining/default.nix5
-rw-r--r--pkgs/development/python-modules/cmd2/default.nix4
-rw-r--r--pkgs/development/python-modules/co2signal/default.nix29
-rw-r--r--pkgs/development/python-modules/cocotb-bus/default.nix4
-rw-r--r--pkgs/development/python-modules/cocotb/default.nix9
-rw-r--r--pkgs/development/python-modules/commoncode/default.nix8
-rw-r--r--pkgs/development/python-modules/configparser/4.nix26
-rw-r--r--pkgs/development/python-modules/configparser/default.nix4
-rw-r--r--pkgs/development/python-modules/confluent-kafka/default.nix4
-rw-r--r--pkgs/development/python-modules/connexion/default.nix27
-rw-r--r--pkgs/development/python-modules/consonance/default.nix46
-rw-r--r--pkgs/development/python-modules/construct/2.10.54.nix40
-rw-r--r--pkgs/development/python-modules/construct/default.nix6
-rw-r--r--pkgs/development/python-modules/contextlib2/0.nix23
-rw-r--r--pkgs/development/python-modules/contextlib2/default.nix23
-rw-r--r--pkgs/development/python-modules/cornice/default.nix4
-rw-r--r--pkgs/development/python-modules/cot/default.nix61
-rw-r--r--pkgs/development/python-modules/cozy/default.nix62
-rw-r--r--pkgs/development/python-modules/croniter/default.nix4
-rw-r--r--pkgs/development/python-modules/cryptography/3.3.nix81
-rw-r--r--pkgs/development/python-modules/cryptography/default.nix6
-rw-r--r--pkgs/development/python-modules/cryptography/vectors-3.3.nix23
-rw-r--r--pkgs/development/python-modules/cryptography/vectors.nix2
-rw-r--r--pkgs/development/python-modules/css-parser/default.nix14
-rw-r--r--pkgs/development/python-modules/cssutils/default.nix10
-rw-r--r--pkgs/development/python-modules/cupy/default.nix4
-rw-r--r--pkgs/development/python-modules/cx_freeze/default.nix6
-rw-r--r--pkgs/development/python-modules/cyclonedx-python-lib/default.nix16
-rw-r--r--pkgs/development/python-modules/dacite/default.nix12
-rw-r--r--pkgs/development/python-modules/datadog/default.nix4
-rw-r--r--pkgs/development/python-modules/dataset/default.nix35
-rw-r--r--pkgs/development/python-modules/dbus/default.nix4
-rw-r--r--pkgs/development/python-modules/debian/default.nix14
-rw-r--r--pkgs/development/python-modules/debugpy/default.nix23
-rw-r--r--pkgs/development/python-modules/decorator/4.nix21
-rw-r--r--pkgs/development/python-modules/deemix/default.nix14
-rw-r--r--pkgs/development/python-modules/deep-translator/default.nix4
-rw-r--r--pkgs/development/python-modules/deezer-py/default.nix4
-rw-r--r--pkgs/development/python-modules/deezer-python/default.nix4
-rw-r--r--pkgs/development/python-modules/demjson/default.nix19
-rw-r--r--pkgs/development/python-modules/denonavr/default.nix11
-rw-r--r--pkgs/development/python-modules/deprecation/default.nix24
-rw-r--r--pkgs/development/python-modules/devolo-plc-api/default.nix8
-rw-r--r--pkgs/development/python-modules/devtools/default.nix2
-rw-r--r--pkgs/development/python-modules/diagrams/default.nix4
-rw-r--r--pkgs/development/python-modules/dictdiffer/default.nix50
-rw-r--r--pkgs/development/python-modules/diff-cover/default.nix4
-rw-r--r--pkgs/development/python-modules/diofant/default.nix5
-rw-r--r--pkgs/development/python-modules/diskcache/default.nix44
-rw-r--r--pkgs/development/python-modules/dj-email-url/default.nix4
-rw-r--r--pkgs/development/python-modules/django-anymail/default.nix4
-rw-r--r--pkgs/development/python-modules/django-debug-toolbar/default.nix4
-rw-r--r--pkgs/development/python-modules/django-extensions/default.nix47
-rw-r--r--pkgs/development/python-modules/django-maintenance-mode/default.nix4
-rw-r--r--pkgs/development/python-modules/django-oauth-toolkit/default.nix4
-rw-r--r--pkgs/development/python-modules/django-taggit/default.nix4
-rw-r--r--pkgs/development/python-modules/django/2.nix4
-rw-r--r--pkgs/development/python-modules/django/3.nix4
-rw-r--r--pkgs/development/python-modules/dnslib/default.nix4
-rw-r--r--pkgs/development/python-modules/dogpile-cache/default.nix4
-rw-r--r--pkgs/development/python-modules/doit/default.nix4
-rw-r--r--pkgs/development/python-modules/downloader-cli/default.nix4
-rw-r--r--pkgs/development/python-modules/drf-jwt/default.nix4
-rw-r--r--pkgs/development/python-modules/duckdb/default.nix2
-rw-r--r--pkgs/development/python-modules/dufte/default.nix11
-rw-r--r--pkgs/development/python-modules/dulwich/default.nix4
-rw-r--r--pkgs/development/python-modules/easy-thumbnails/default.nix4
-rw-r--r--pkgs/development/python-modules/einops/default.nix5
-rw-r--r--pkgs/development/python-modules/elegy/default.nix75
-rw-r--r--pkgs/development/python-modules/elgato/default.nix6
-rw-r--r--pkgs/development/python-modules/emv/default.nix3
-rw-r--r--pkgs/development/python-modules/enaml/default.nix4
-rw-r--r--pkgs/development/python-modules/enamlx/default.nix4
-rw-r--r--pkgs/development/python-modules/enrich/default.nix4
-rw-r--r--pkgs/development/python-modules/enturclient/default.nix4
-rw-r--r--pkgs/development/python-modules/enum/default.nix26
-rw-r--r--pkgs/development/python-modules/envisage/default.nix34
-rw-r--r--pkgs/development/python-modules/eventlet/default.nix72
-rw-r--r--pkgs/development/python-modules/exchangelib/default.nix9
-rw-r--r--pkgs/development/python-modules/faker/default.nix4
-rw-r--r--pkgs/development/python-modules/faraday-plugins/default.nix4
-rw-r--r--pkgs/development/python-modules/fastapi/default.nix6
-rw-r--r--pkgs/development/python-modules/fastavro/default.nix4
-rw-r--r--pkgs/development/python-modules/fastjsonschema/default.nix31
-rw-r--r--pkgs/development/python-modules/file-read-backwards/default.nix22
-rw-r--r--pkgs/development/python-modules/filelock/3.2.nix22
-rw-r--r--pkgs/development/python-modules/fixtures/default.nix2
-rw-r--r--pkgs/development/python-modules/flake8-docstrings/default.nix27
-rw-r--r--pkgs/development/python-modules/flask-gravatar/default.nix47
-rw-r--r--pkgs/development/python-modules/flask-login/default.nix44
-rw-r--r--pkgs/development/python-modules/flask-paranoid/default.nix40
-rw-r--r--pkgs/development/python-modules/flask-security-too/default.nix76
-rw-r--r--pkgs/development/python-modules/flask/1.nix28
-rw-r--r--pkgs/development/python-modules/flatten-dict/default.nix46
-rw-r--r--pkgs/development/python-modules/flux-led/default.nix4
-rw-r--r--pkgs/development/python-modules/formbox/default.nix6
-rw-r--r--pkgs/development/python-modules/fountains/default.nix2
-rw-r--r--pkgs/development/python-modules/freezegun/0.3.nix29
-rw-r--r--pkgs/development/python-modules/frozendict/default.nix4
-rw-r--r--pkgs/development/python-modules/futures/default.nix27
-rw-r--r--pkgs/development/python-modules/gamble/default.nix32
-rw-r--r--pkgs/development/python-modules/geoalchemy2/default.nix4
-rw-r--r--pkgs/development/python-modules/glances-api/default.nix4
-rw-r--r--pkgs/development/python-modules/glasgow/default.nix14
-rw-r--r--pkgs/development/python-modules/glcontext/default.nix4
-rw-r--r--pkgs/development/python-modules/glean-parser/default.nix4
-rw-r--r--pkgs/development/python-modules/glom/default.nix35
-rw-r--r--pkgs/development/python-modules/gmpy2/default.nix6
-rw-r--r--pkgs/development/python-modules/goodwe/default.nix4
-rw-r--r--pkgs/development/python-modules/google-api-core/default.nix4
-rw-r--r--pkgs/development/python-modules/google-api-python-client/default.nix4
-rw-r--r--pkgs/development/python-modules/google-apputils/default.nix41
-rw-r--r--pkgs/development/python-modules/google-cloud-automl/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-bigquery/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-datacatalog/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-dataproc/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-dlp/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-language/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-logging/default.nix2
-rw-r--r--pkgs/development/python-modules/google-cloud-redis/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-securitycenter/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-speech/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-storage/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-tasks/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-testutils/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-texttospeech/default.nix4
-rw-r--r--pkgs/development/python-modules/google-nest-sdm/default.nix17
-rw-r--r--pkgs/development/python-modules/gphoto2/default.nix4
-rw-r--r--pkgs/development/python-modules/gpxpy/default.nix8
-rw-r--r--pkgs/development/python-modules/grandalf/default.nix32
-rw-r--r--pkgs/development/python-modules/graph-tool/default.nix (renamed from pkgs/development/python-modules/graph-tool/2.x.x.nix)0
-rw-r--r--pkgs/development/python-modules/grappelli_safe/default.nix4
-rw-r--r--pkgs/development/python-modules/greeclimate/default.nix4
-rw-r--r--pkgs/development/python-modules/green/default.nix4
-rw-r--r--pkgs/development/python-modules/gvm-tools/default.nix3
-rw-r--r--pkgs/development/python-modules/hahomematic/default.nix4
-rw-r--r--pkgs/development/python-modules/hangups/default.nix7
-rw-r--r--pkgs/development/python-modules/hap-python/default.nix4
-rw-r--r--pkgs/development/python-modules/hass-nabucasa/default.nix4
-rw-r--r--pkgs/development/python-modules/holidays/default.nix4
-rw-r--r--pkgs/development/python-modules/homematicip/default.nix11
-rw-r--r--pkgs/development/python-modules/html5lib/default.nix6
-rw-r--r--pkgs/development/python-modules/httpagentparser/default.nix26
-rw-r--r--pkgs/development/python-modules/httplib2/default.nix6
-rw-r--r--pkgs/development/python-modules/httpretty/0.nix52
-rw-r--r--pkgs/development/python-modules/humanfriendly/default.nix4
-rw-r--r--pkgs/development/python-modules/hwi/default.nix17
-rw-r--r--pkgs/development/python-modules/hypothesis/2.nix45
-rw-r--r--pkgs/development/python-modules/hypothesis/default.nix4
-rw-r--r--pkgs/development/python-modules/ibis-framework/default.nix126
-rw-r--r--pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix4
-rw-r--r--pkgs/development/python-modules/ics/default.nix2
-rw-r--r--pkgs/development/python-modules/idasen/default.nix4
-rw-r--r--pkgs/development/python-modules/identify/default.nix4
-rw-r--r--pkgs/development/python-modules/idna/2.nix23
-rw-r--r--pkgs/development/python-modules/igraph/default.nix4
-rw-r--r--pkgs/development/python-modules/ihatemoney/default.nix72
-rw-r--r--pkgs/development/python-modules/imageio/default.nix4
-rw-r--r--pkgs/development/python-modules/imbalanced-learn/default.nix4
-rw-r--r--pkgs/development/python-modules/img2pdf/default.nix47
-rw-r--r--pkgs/development/python-modules/iminuit/default.nix4
-rw-r--r--pkgs/development/python-modules/importlib-metadata/2.nix37
-rw-r--r--pkgs/development/python-modules/influxdb-client/default.nix4
-rw-r--r--pkgs/development/python-modules/installer/default.nix35
-rw-r--r--pkgs/development/python-modules/internetarchive/default.nix4
-rw-r--r--pkgs/development/python-modules/ipaddr/default.nix23
-rw-r--r--pkgs/development/python-modules/ipwhl/default.nix28
-rw-r--r--pkgs/development/python-modules/ipykernel/default.nix4
-rw-r--r--pkgs/development/python-modules/ipython/7.16.nix69
-rw-r--r--pkgs/development/python-modules/ipython/default.nix4
-rw-r--r--pkgs/development/python-modules/irc/default.nix4
-rw-r--r--pkgs/development/python-modules/iso8601/default.nix20
-rw-r--r--pkgs/development/python-modules/isort/default.nix1
-rw-r--r--pkgs/development/python-modules/itanium_demangler/default.nix30
-rw-r--r--pkgs/development/python-modules/itemdb/default.nix26
-rw-r--r--pkgs/development/python-modules/itsdangerous/1.nix21
-rw-r--r--pkgs/development/python-modules/jax/default.nix4
-rw-r--r--pkgs/development/python-modules/jc/default.nix4
-rw-r--r--pkgs/development/python-modules/jdatetime/default.nix4
-rw-r--r--pkgs/development/python-modules/jedi-language-server/default.nix4
-rw-r--r--pkgs/development/python-modules/jedi/default.nix4
-rw-r--r--pkgs/development/python-modules/jenkins-job-builder/default.nix3
-rw-r--r--pkgs/development/python-modules/jinja2/2.nix42
-rw-r--r--pkgs/development/python-modules/jsmin/default.nix27
-rw-r--r--pkgs/development/python-modules/json-schema-for-humans/default.nix8
-rw-r--r--pkgs/development/python-modules/json-tricks/default.nix33
-rw-r--r--pkgs/development/python-modules/jupyter-packaging/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyterlab-widgets/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyterlab/default.nix28
-rw-r--r--pkgs/development/python-modules/jupyterlab_server/default.nix19
-rw-r--r--pkgs/development/python-modules/kaptan/default.nix2
-rw-r--r--pkgs/development/python-modules/keyring/default.nix6
-rw-r--r--pkgs/development/python-modules/kombu/default.nix28
-rw-r--r--pkgs/development/python-modules/labmath/default.nix9
-rw-r--r--pkgs/development/python-modules/launchpadlib/default.nix4
-rw-r--r--pkgs/development/python-modules/libagent/default.nix12
-rw-r--r--pkgs/development/python-modules/libcloud/2.nix39
-rw-r--r--pkgs/development/python-modules/libvirt/default.nix4
-rw-r--r--pkgs/development/python-modules/lightgbm/default.nix4
-rw-r--r--pkgs/development/python-modules/limiter/default.nix7
-rw-r--r--pkgs/development/python-modules/limits/default.nix4
-rw-r--r--pkgs/development/python-modules/liquidctl/default.nix4
-rw-r--r--pkgs/development/python-modules/logfury/default.nix8
-rw-r--r--pkgs/development/python-modules/loguru/default.nix44
-rw-r--r--pkgs/development/python-modules/lpod/default.nix31
-rw-r--r--pkgs/development/python-modules/luftdaten/default.nix4
-rw-r--r--pkgs/development/python-modules/luxtronik/default.nix4
-rw-r--r--pkgs/development/python-modules/lxml/default.nix4
-rw-r--r--pkgs/development/python-modules/mailchecker/default.nix32
-rw-r--r--pkgs/development/python-modules/makefun/default.nix4
-rw-r--r--pkgs/development/python-modules/marisa/default.nix29
-rw-r--r--pkgs/development/python-modules/markdown/3_1.nix33
-rw-r--r--pkgs/development/python-modules/markdown/default.nix4
-rw-r--r--pkgs/development/python-modules/markupsafe/1.nix22
-rw-r--r--pkgs/development/python-modules/marshmallow-dataclass/default.nix16
-rw-r--r--pkgs/development/python-modules/matrix-common/default.nix27
-rw-r--r--pkgs/development/python-modules/mattermostdriver/default.nix4
-rw-r--r--pkgs/development/python-modules/mautrix/default.nix4
-rw-r--r--pkgs/development/python-modules/mayavi/default.nix40
-rw-r--r--pkgs/development/python-modules/mdformat/default.nix4
-rw-r--r--pkgs/development/python-modules/meross-iot/default.nix4
-rw-r--r--pkgs/development/python-modules/meshtastic/default.nix4
-rw-r--r--pkgs/development/python-modules/metakernel/default.nix4
-rw-r--r--pkgs/development/python-modules/micloud/default.nix6
-rw-r--r--pkgs/development/python-modules/minexr/default.nix31
-rw-r--r--pkgs/development/python-modules/mitogen/default.nix12
-rw-r--r--pkgs/development/python-modules/mlflow/default.nix21
-rw-r--r--pkgs/development/python-modules/mock/2.nix44
-rw-r--r--pkgs/development/python-modules/mocket/default.nix4
-rw-r--r--pkgs/development/python-modules/mongomock/default.nix40
-rw-r--r--pkgs/development/python-modules/more-itertools/2.7.nix31
-rw-r--r--pkgs/development/python-modules/motionblinds/default.nix4
-rw-r--r--pkgs/development/python-modules/msal-extensions/default.nix4
-rw-r--r--pkgs/development/python-modules/msoffcrypto-tool/default.nix4
-rw-r--r--pkgs/development/python-modules/mutagen/1.43.nix34
-rw-r--r--pkgs/development/python-modules/mutmut/default.nix44
-rw-r--r--pkgs/development/python-modules/natsort/default.nix4
-rw-r--r--pkgs/development/python-modules/nbsphinx/default.nix4
-rw-r--r--pkgs/development/python-modules/ncclient/default.nix1
-rw-r--r--pkgs/development/python-modules/nest-asyncio/default.nix4
-rw-r--r--pkgs/development/python-modules/netdata/default.nix4
-rw-r--r--pkgs/development/python-modules/nexia/default.nix13
-rw-r--r--pkgs/development/python-modules/nidaqmx/default.nix4
-rw-r--r--pkgs/development/python-modules/nmapthon2/default.nix23
-rw-r--r--pkgs/development/python-modules/nmigen-boards/default.nix38
-rw-r--r--pkgs/development/python-modules/nmigen-soc/default.nix35
-rw-r--r--pkgs/development/python-modules/notmuch/2.nix27
-rw-r--r--pkgs/development/python-modules/numpy/1.16.nix99
-rw-r--r--pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch30
-rw-r--r--pkgs/development/python-modules/oci/default.nix37
-rw-r--r--pkgs/development/python-modules/od/default.nix6
-rw-r--r--pkgs/development/python-modules/olefile/default.nix22
-rw-r--r--pkgs/development/python-modules/openai/default.nix4
-rw-r--r--pkgs/development/python-modules/openapi-core/default.nix2
-rw-r--r--pkgs/development/python-modules/openstacksdk/default.nix4
-rw-r--r--pkgs/development/python-modules/opt-einsum/default.nix34
-rw-r--r--pkgs/development/python-modules/orjson/default.nix6
-rw-r--r--pkgs/development/python-modules/orm/default.nix39
-rw-r--r--pkgs/development/python-modules/oslo-utils/default.nix4
-rw-r--r--pkgs/development/python-modules/oyaml/default.nix36
-rw-r--r--pkgs/development/python-modules/pa-ringbuffer/default.nix4
-rw-r--r--pkgs/development/python-modules/packaging/2.nix39
-rw-r--r--pkgs/development/python-modules/pamqp/default.nix4
-rw-r--r--pkgs/development/python-modules/panflute/default.nix18
-rw-r--r--pkgs/development/python-modules/paramiko/default.nix4
-rw-r--r--pkgs/development/python-modules/parso/default.nix19
-rw-r--r--pkgs/development/python-modules/parsy/default.nix10
-rw-r--r--pkgs/development/python-modules/pdm-pep517/default.nix38
-rw-r--r--pkgs/development/python-modules/pebble/default.nix4
-rw-r--r--pkgs/development/python-modules/pecan/default.nix40
-rw-r--r--pkgs/development/python-modules/phonenumbers/default.nix4
-rw-r--r--pkgs/development/python-modules/pijuice/default.nix61
-rw-r--r--pkgs/development/python-modules/pijuice/patch-shebang.diff9
-rw-r--r--pkgs/development/python-modules/pikepdf/default.nix4
-rw-r--r--pkgs/development/python-modules/pillow/6.nix47
-rw-r--r--pkgs/development/python-modules/pip-tools/default.nix4
-rw-r--r--pkgs/development/python-modules/pip/20.nix41
-rw-r--r--pkgs/development/python-modules/pip/default.nix9
-rw-r--r--pkgs/development/python-modules/pixelmatch/default.nix32
-rw-r--r--pkgs/development/python-modules/pkuseg/default.nix3
-rw-r--r--pkgs/development/python-modules/pluggy/0.nix34
-rw-r--r--pkgs/development/python-modules/plugwise/default.nix4
-rw-r--r--pkgs/development/python-modules/poetry/default.nix51
-rw-r--r--pkgs/development/python-modules/policyuniverse/default.nix4
-rw-r--r--pkgs/development/python-modules/pontos/default.nix4
-rw-r--r--pkgs/development/python-modules/pony/default.nix41
-rw-r--r--pkgs/development/python-modules/pot/default.nix4
-rw-r--r--pkgs/development/python-modules/ppscore/default.nix26
-rw-r--r--pkgs/development/python-modules/prettytable/1.nix37
-rw-r--r--pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix4
-rw-r--r--pkgs/development/python-modules/prompt-toolkit/default.nix4
-rw-r--r--pkgs/development/python-modules/proton-client/default.nix4
-rw-r--r--pkgs/development/python-modules/protonvpn-nm-lib/default.nix4
-rw-r--r--pkgs/development/python-modules/pscript/default.nix39
-rw-r--r--pkgs/development/python-modules/pudb/default.nix4
-rw-r--r--pkgs/development/python-modules/py-nightscout/default.nix4
-rw-r--r--pkgs/development/python-modules/py-tes/default.nix49
-rw-r--r--pkgs/development/python-modules/pyTelegramBotAPI/default.nix8
-rw-r--r--pkgs/development/python-modules/py_scrypt/default.nix4
-rw-r--r--pkgs/development/python-modules/pyathena/default.nix22
-rw-r--r--pkgs/development/python-modules/pyatv/default.nix4
-rw-r--r--pkgs/development/python-modules/pybotvac/default.nix4
-rw-r--r--pkgs/development/python-modules/pycairo/1.18.nix52
-rw-r--r--pkgs/development/python-modules/pycocotools/default.nix6
-rw-r--r--pkgs/development/python-modules/pycognito/default.nix4
-rw-r--r--pkgs/development/python-modules/pydal/default.nix17
-rw-r--r--pkgs/development/python-modules/pydantic/default.nix4
-rw-r--r--pkgs/development/python-modules/pydelijn/default.nix4
-rw-r--r--pkgs/development/python-modules/pydevccu/default.nix9
-rw-r--r--pkgs/development/python-modules/pydrive2/default.nix39
-rw-r--r--pkgs/development/python-modules/pygal/default.nix12
-rw-r--r--pkgs/development/python-modules/pygit2/default.nix4
-rw-r--r--pkgs/development/python-modules/pygls/default.nix6
-rw-r--r--pkgs/development/python-modules/pygobject/3.36.nix33
-rw-r--r--pkgs/development/python-modules/pygraphviz/default.nix8
-rw-r--r--pkgs/development/python-modules/pygtk/default.nix74
-rw-r--r--pkgs/development/python-modules/pyhiveapi/default.nix4
-rw-r--r--pkgs/development/python-modules/pyhomematic/default.nix4
-rw-r--r--pkgs/development/python-modules/pyjwt/1.nix44
-rw-r--r--pkgs/development/python-modules/pyjwt/default.nix4
-rw-r--r--pkgs/development/python-modules/pykeyatome/default.nix6
-rw-r--r--pkgs/development/python-modules/pylaunches/default.nix4
-rw-r--r--pkgs/development/python-modules/pylgnetcast/default.nix4
-rw-r--r--pkgs/development/python-modules/pymavlink/default.nix2
-rw-r--r--pkgs/development/python-modules/pymazda/default.nix11
-rw-r--r--pkgs/development/python-modules/pymelcloud/default.nix4
-rw-r--r--pkgs/development/python-modules/pymongo/default.nix4
-rw-r--r--pkgs/development/python-modules/pymsteams/default.nix17
-rw-r--r--pkgs/development/python-modules/pymupdf/default.nix4
-rw-r--r--pkgs/development/python-modules/pynetbox/default.nix4
-rw-r--r--pkgs/development/python-modules/pynetdicom/default.nix3
-rw-r--r--pkgs/development/python-modules/pynut2/default.nix33
-rw-r--r--pkgs/development/python-modules/pyomo/default.nix21
-rw-r--r--pkgs/development/python-modules/pyopengl/default.nix4
-rw-r--r--pkgs/development/python-modules/pyqt-builder/default.nix4
-rw-r--r--pkgs/development/python-modules/pyquaternion/default.nix34
-rw-r--r--pkgs/development/python-modules/pyradios/default.nix17
-rw-r--r--pkgs/development/python-modules/pyrmvtransport/default.nix10
-rw-r--r--pkgs/development/python-modules/pyro4/default.nix25
-rw-r--r--pkgs/development/python-modules/pyrogram/default.nix15
-rw-r--r--pkgs/development/python-modules/pyroma/2.nix26
-rw-r--r--pkgs/development/python-modules/pysma/default.nix4
-rw-r--r--pkgs/development/python-modules/pysnooper/default.nix4
-rw-r--r--pkgs/development/python-modules/pyspnego/default.nix2
-rw-r--r--pkgs/development/python-modules/pysqlite/default.nix57
-rw-r--r--pkgs/development/python-modules/pyswitchbot/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-annotate/default.nix19
-rw-r--r--pkgs/development/python-modules/pytest-asyncio/default.nix42
-rw-r--r--pkgs/development/python-modules/pytest-benchmark/default.nix35
-rw-r--r--pkgs/development/python-modules/pytest-cases/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-check/default.nix5
-rw-r--r--pkgs/development/python-modules/pytest-django/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-doctestplus/default.nix16
-rw-r--r--pkgs/development/python-modules/pytest-forked/default.nix7
-rw-r--r--pkgs/development/python-modules/pytest-httpx/default.nix18
-rw-r--r--pkgs/development/python-modules/pytest-localserver/default.nix17
-rw-r--r--pkgs/development/python-modules/pytest-logdog/default.nix49
-rw-r--r--pkgs/development/python-modules/pytest-order/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-randomly/default.nix37
-rw-r--r--pkgs/development/python-modules/pytest-runner/2.nix30
-rw-r--r--pkgs/development/python-modules/pytest-snapshot/default.nix42
-rw-r--r--pkgs/development/python-modules/pytest-timeout/default.nix22
-rw-r--r--pkgs/development/python-modules/pytest-xdist/1.nix36
-rw-r--r--pkgs/development/python-modules/pytest-xdist/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest/4.nix68
-rw-r--r--pkgs/development/python-modules/pytest/5.nix95
-rw-r--r--pkgs/development/python-modules/pytest/default.nix12
-rw-r--r--pkgs/development/python-modules/python-benedict/default.nix75
-rw-r--r--pkgs/development/python-modules/python-daemon/default.nix56
-rw-r--r--pkgs/development/python-modules/python-engineio/default.nix4
-rw-r--r--pkgs/development/python-modules/python-fsutil/default.nix51
-rw-r--r--pkgs/development/python-modules/python-gitlab/default.nix4
-rw-r--r--pkgs/development/python-modules/python-heatclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-http-client/default.nix7
-rw-r--r--pkgs/development/python-modules/python-ironicclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-kasa/default.nix23
-rw-r--r--pkgs/development/python-modules/python-keystoneclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-miio/default.nix11
-rw-r--r--pkgs/development/python-modules/python-multipart/default.nix29
-rw-r--r--pkgs/development/python-modules/python-smarttub/default.nix9
-rw-r--r--pkgs/development/python-modules/python-socketio/default.nix4
-rw-r--r--pkgs/development/python-modules/python-telegram-bot/default.nix4
-rw-r--r--pkgs/development/python-modules/pythondialog/default.nix4
-rw-r--r--pkgs/development/python-modules/pythonfinder/default.nix56
-rw-r--r--pkgs/development/python-modules/pytibber/default.nix4
-rw-r--r--pkgs/development/python-modules/pytorch/bin.nix4
-rw-r--r--pkgs/development/python-modules/pytorch/binary-hashes.nix25
-rw-r--r--pkgs/development/python-modules/pytradfri/default.nix4
-rw-r--r--pkgs/development/python-modules/pyturbojpeg/default.nix4
-rw-r--r--pkgs/development/python-modules/pyutilib/default.nix4
-rw-r--r--pkgs/development/python-modules/pyvex/default.nix32
-rw-r--r--pkgs/development/python-modules/pywayland/default.nix4
-rw-r--r--pkgs/development/python-modules/pywilight/default.nix4
-rw-r--r--pkgs/development/python-modules/pywlroots/default.nix4
-rw-r--r--pkgs/development/python-modules/pyyaml/default.nix14
-rw-r--r--pkgs/development/python-modules/qcs-api-client/default.nix43
-rw-r--r--pkgs/development/python-modules/qpid-python/default.nix26
-rw-r--r--pkgs/development/python-modules/qtpy/default.nix4
-rw-r--r--pkgs/development/python-modules/quamash/default.nix13
-rw-r--r--pkgs/development/python-modules/quandl/default.nix64
-rw-r--r--pkgs/development/python-modules/readme_renderer/default.nix7
-rw-r--r--pkgs/development/python-modules/remarshal/default.nix41
-rw-r--r--pkgs/development/python-modules/repeated_test/default.nix26
-rw-r--r--pkgs/development/python-modules/reportlab/default.nix4
-rw-r--r--pkgs/development/python-modules/requests-kerberos/default.nix4
-rw-r--r--pkgs/development/python-modules/requests-toolbelt/default.nix59
-rw-r--r--pkgs/development/python-modules/restfly/default.nix4
-rw-r--r--pkgs/development/python-modules/restview/default.nix9
-rw-r--r--pkgs/development/python-modules/rich/default.nix4
-rw-r--r--pkgs/development/python-modules/roboschool/default.nix79
-rw-r--r--pkgs/development/python-modules/roombapy/default.nix6
-rw-r--r--pkgs/development/python-modules/rpi-bad-power/default.nix37
-rw-r--r--pkgs/development/python-modules/rpyc/default.nix22
-rw-r--r--pkgs/development/python-modules/ruamel-yaml/default.nix4
-rw-r--r--pkgs/development/python-modules/s3fs/default.nix4
-rw-r--r--pkgs/development/python-modules/s3transfer/0_4.nix52
-rw-r--r--pkgs/development/python-modules/s3transfer/default.nix67
-rw-r--r--pkgs/development/python-modules/sagemaker/default.nix22
-rw-r--r--pkgs/development/python-modules/sasmodels/default.nix4
-rw-r--r--pkgs/development/python-modules/scandir/default.nix20
-rw-r--r--pkgs/development/python-modules/schema-salad/default.nix4
-rw-r--r--pkgs/development/python-modules/schema/default.nix33
-rw-r--r--pkgs/development/python-modules/scikit-survival/default.nix4
-rw-r--r--pkgs/development/python-modules/scikits-odes/default.nix4
-rw-r--r--pkgs/development/python-modules/scmrepo/default.nix53
-rw-r--r--pkgs/development/python-modules/scrapy/default.nix11
-rw-r--r--pkgs/development/python-modules/screenlogicpy/default.nix4
-rw-r--r--pkgs/development/python-modules/secretstorage/2.nix24
-rw-r--r--pkgs/development/python-modules/semver/default.nix28
-rw-r--r--pkgs/development/python-modules/sendgrid/default.nix7
-rw-r--r--pkgs/development/python-modules/sense-energy/default.nix4
-rw-r--r--pkgs/development/python-modules/sentinels/default.nix36
-rw-r--r--pkgs/development/python-modules/sentry-sdk/default.nix4
-rw-r--r--pkgs/development/python-modules/serverlessrepo/default.nix27
-rw-r--r--pkgs/development/python-modules/setuptools-scm/2.nix24
-rw-r--r--pkgs/development/python-modules/setuptools/44.0.nix80
-rw-r--r--pkgs/development/python-modules/shodan/default.nix13
-rw-r--r--pkgs/development/python-modules/shtab/default.nix55
-rw-r--r--pkgs/development/python-modules/sigrok/default.nix62
-rw-r--r--pkgs/development/python-modules/sigrok/python-install.patch16
-rw-r--r--pkgs/development/python-modules/sigtools/default.nix7
-rw-r--r--pkgs/development/python-modules/simpleeval/default.nix4
-rw-r--r--pkgs/development/python-modules/sip/default.nix4
-rw-r--r--pkgs/development/python-modules/smart-meter-texas/default.nix4
-rw-r--r--pkgs/development/python-modules/snowflake-connector-python/default.nix4
-rw-r--r--pkgs/development/python-modules/socketio-client/default.nix39
-rw-r--r--pkgs/development/python-modules/soco/default.nix4
-rw-r--r--pkgs/development/python-modules/somajo/default.nix28
-rw-r--r--pkgs/development/python-modules/sopel/default.nix4
-rw-r--r--pkgs/development/python-modules/sounddevice/default.nix7
-rw-r--r--pkgs/development/python-modules/spacy-loggers/default.nix34
-rw-r--r--pkgs/development/python-modules/spacy/default.nix8
-rw-r--r--pkgs/development/python-modules/speaklater3/default.nix23
-rw-r--r--pkgs/development/python-modules/sphinx-inline-tabs/default.nix4
-rw-r--r--pkgs/development/python-modules/sphinx/2.nix82
-rw-r--r--pkgs/development/python-modules/sphinx/python2-lexer.patch22
-rw-r--r--pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix25
-rw-r--r--pkgs/development/python-modules/spyse-python/default.nix4
-rw-r--r--pkgs/development/python-modules/sqlalchemy-continuum/default.nix6
-rw-r--r--pkgs/development/python-modules/sqlalchemy-migrate/default.nix34
-rw-r--r--pkgs/development/python-modules/sqlalchemy-utils/default.nix4
-rw-r--r--pkgs/development/python-modules/sqlalchemy/default.nix4
-rw-r--r--pkgs/development/python-modules/staticjinja/default.nix10
-rw-r--r--pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix11
-rw-r--r--pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include1
-rw-r--r--pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index1
-rw-r--r--pkgs/development/python-modules/strictyaml/default.nix4
-rw-r--r--pkgs/development/python-modules/stripe/default.nix4
-rw-r--r--pkgs/development/python-modules/stumpy/default.nix17
-rw-r--r--pkgs/development/python-modules/subunit/default.nix7
-rw-r--r--pkgs/development/python-modules/surepy/default.nix3
-rw-r--r--pkgs/development/python-modules/svglib/default.nix4
-rw-r--r--pkgs/development/python-modules/sybil/default.nix24
-rw-r--r--pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix28
-rw-r--r--pkgs/development/python-modules/tatsu/default.nix8
-rw-r--r--pkgs/development/python-modules/tempest/default.nix11
-rw-r--r--pkgs/development/python-modules/tensorboardx/default.nix16
-rw-r--r--pkgs/development/python-modules/tensorflow-datasets/corruptions.patch22
-rw-r--r--pkgs/development/python-modules/tensorflow-datasets/default.nix141
-rw-r--r--pkgs/development/python-modules/tensorflow/bin.nix2
-rw-r--r--pkgs/development/python-modules/terminaltables/default.nix4
-rw-r--r--pkgs/development/python-modules/tern/default.nix4
-rw-r--r--pkgs/development/python-modules/teslajsonpy/default.nix4
-rw-r--r--pkgs/development/python-modules/testfixtures/default.nix31
-rw-r--r--pkgs/development/python-modules/testpath/default.nix6
-rw-r--r--pkgs/development/python-modules/testtools/default.nix2
-rw-r--r--pkgs/development/python-modules/textacy/default.nix4
-rw-r--r--pkgs/development/python-modules/tgcrypto/default.nix4
-rw-r--r--pkgs/development/python-modules/thespian/default.nix4
-rw-r--r--pkgs/development/python-modules/tifffile/default.nix60
-rw-r--r--pkgs/development/python-modules/time-machine/default.nix6
-rw-r--r--pkgs/development/python-modules/timetagger/default.nix47
-rw-r--r--pkgs/development/python-modules/tinydb/default.nix4
-rw-r--r--pkgs/development/python-modules/torchinfo/default.nix43
-rw-r--r--pkgs/development/python-modules/traits/default.nix19
-rw-r--r--pkgs/development/python-modules/transformers/default.nix4
-rw-r--r--pkgs/development/python-modules/transip/default.nix38
-rw-r--r--pkgs/development/python-modules/transitions/default.nix12
-rw-r--r--pkgs/development/python-modules/treex/default.nix74
-rw-r--r--pkgs/development/python-modules/trimesh/default.nix4
-rw-r--r--pkgs/development/python-modules/trio/default.nix4
-rw-r--r--pkgs/development/python-modules/trytond/default.nix4
-rw-r--r--pkgs/development/python-modules/twinkly-client/default.nix15
-rw-r--r--pkgs/development/python-modules/types-decorator/default.nix4
-rw-r--r--pkgs/development/python-modules/types-freezegun/default.nix29
-rw-r--r--pkgs/development/python-modules/types-futures/default.nix4
-rw-r--r--pkgs/development/python-modules/types-protobuf/default.nix4
-rw-r--r--pkgs/development/python-modules/types-pytz/default.nix4
-rw-r--r--pkgs/development/python-modules/types-requests/default.nix9
-rw-r--r--pkgs/development/python-modules/types-setuptools/default.nix4
-rw-r--r--pkgs/development/python-modules/types-tabulate/default.nix28
-rw-r--r--pkgs/development/python-modules/types-toml/default.nix4
-rw-r--r--pkgs/development/python-modules/types-urllib3/default.nix29
-rw-r--r--pkgs/development/python-modules/typesystem/default.nix26
-rw-r--r--pkgs/development/python-modules/typical/default.nix20
-rw-r--r--pkgs/development/python-modules/typical/use-poetry-core.patch13
-rw-r--r--pkgs/development/python-modules/typing/default.nix33
-rw-r--r--pkgs/development/python-modules/uamqp/default.nix13
-rw-r--r--pkgs/development/python-modules/umap-learn/default.nix3
-rw-r--r--pkgs/development/python-modules/urlextract/default.nix16
-rw-r--r--pkgs/development/python-modules/urllib3/2.nix81
-rw-r--r--pkgs/development/python-modules/vcrpy/3.nix48
-rw-r--r--pkgs/development/python-modules/versionfinder/default.nix24
-rw-r--r--pkgs/development/python-modules/vertica-python/default.nix4
-rw-r--r--pkgs/development/python-modules/vine/default.nix24
-rw-r--r--pkgs/development/python-modules/vt-py/default.nix4
-rw-r--r--pkgs/development/python-modules/wandb/default.nix138
-rw-r--r--pkgs/development/python-modules/wavedrom/default.nix25
-rw-r--r--pkgs/development/python-modules/weasyprint/default.nix66
-rw-r--r--pkgs/development/python-modules/weasyprint/library-paths.patch15
-rw-r--r--pkgs/development/python-modules/websocket-client/default.nix4
-rw-r--r--pkgs/development/python-modules/werkzeug/1.nix60
-rw-r--r--pkgs/development/python-modules/wled/default.nix4
-rw-r--r--pkgs/development/python-modules/wrf-python/default.nix4
-rw-r--r--pkgs/development/python-modules/wsgi-intercept/default.nix4
-rw-r--r--pkgs/development/python-modules/wsproto/0.14.nix25
-rw-r--r--pkgs/development/python-modules/wtforms/default.nix18
-rw-r--r--pkgs/development/python-modules/wxPython/3.0.nix91
-rw-r--r--pkgs/development/python-modules/xarray/default.nix6
-rw-r--r--pkgs/development/python-modules/yacs/default.nix32
-rw-r--r--pkgs/development/python-modules/yalexs/default.nix4
-rw-r--r--pkgs/development/python-modules/yaspin/default.nix32
-rw-r--r--pkgs/development/python-modules/youtube-search-python/default.nix4
-rw-r--r--pkgs/development/python-modules/ytmusicapi/default.nix4
-rw-r--r--pkgs/development/python-modules/zcs/default.nix33
-rw-r--r--pkgs/development/python-modules/zeep/default.nix9
-rw-r--r--pkgs/development/python-modules/zigpy-znp/default.nix4
-rw-r--r--pkgs/development/python-modules/zigpy/default.nix4
-rw-r--r--pkgs/development/python-modules/zipp/1.nix37
-rw-r--r--pkgs/development/python-modules/zope-deferredimport/default.nix4
-rw-r--r--pkgs/development/python-modules/zope-hookable/default.nix4
-rwxr-xr-xpkgs/development/python-modules/zstandard/default.nix4
-rw-r--r--pkgs/development/python-modules/zstd/default.nix4
674 files changed, 6870 insertions, 5535 deletions
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index e0ebf564163f..52d4ecdc3b71 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -2,55 +2,51 @@
, stdenv
, buildPythonPackage
, fetchPypi
-, setuptools-scm
-, pytestCheckHook
+, gevent
, pytest-asyncio
, pytest-tornado
-, sqlalchemy
+, pytestCheckHook
+, pythonOlder
+, pytz
+, setuptools
+, setuptools-scm
+, six
, tornado
, twisted
-, mock
-, gevent
-, six
-, pytz
, tzlocal
-, funcsigs
-, setuptools
-, pythonOlder
}:
buildPythonPackage rec {
- pname = "APScheduler";
+ pname = "apscheduler";
version = "3.8.1";
+ format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
- inherit pname version;
- sha256 = "5cf344ebcfbdaa48ae178c029c055cec7bc7a4a47c21e315e4d1f08bd35f2355";
+ pname = "APScheduler";
+ inherit version;
+ hash = "sha256-XPNE68+9qkiuF4wCnAVc7HvHpKR8IeMV5NHwi9NfI1U=";
};
buildInputs = [
setuptools-scm
];
+ propagatedBuildInputs = [
+ pytz
+ setuptools
+ six
+ tzlocal
+ ];
+
checkInputs = [
+ gevent
pytest-asyncio
pytest-tornado
pytestCheckHook
- sqlalchemy
tornado
twisted
- mock
- gevent
- ];
-
- propagatedBuildInputs = [
- six
- pytz
- tzlocal
- funcsigs
- setuptools
];
postPatch = ''
@@ -60,15 +56,21 @@ buildPythonPackage rec {
disabledTests = [
"test_broken_pool"
+ # gevent tests have issue on newer Python releases
+ "test_add_live_job"
+ "test_add_pending_job"
+ "test_shutdown"
] ++ lib.optionals stdenv.isDarwin [
"test_submit_job"
"test_max_instances"
];
- pythonImportsCheck = [ "apscheduler" ];
+ pythonImportsCheck = [
+ "apscheduler"
+ ];
meta = with lib; {
- description = "A Python library that lets you schedule your Python code to be executed";
+ description = "Library that lets you schedule your Python code to be executed";
homepage = "https://github.com/agronholm/apscheduler";
license = licenses.mit;
maintainers = with maintainers; [ ];
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index 7ae407908961..dc909f5bcee8 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "gitpython";
- version = "3.1.24";
+ version = "3.1.25";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "gitpython-developers";
repo = "GitPython";
rev = version;
- sha256 = "sha256-KfR14EqXsDgIZUerk/hHDB0Z7IuqncbTNd/yNwrV9I0=";
+ sha256 = "sha256-ienc7zvLe6t8rkMtC6wVIewUqQBFdFbLc8iPT6aPVrE=";
};
patches = [
diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix
deleted file mode 100644
index aa59c370d2e7..000000000000
--- a/pkgs/development/python-modules/Pygments/2_5.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, fetchpatch
-, docutils
-}:
-
-buildPythonPackage rec {
- pname = "Pygments";
- version = "2.5.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe";
- };
-
- patches = [
- (fetchpatch {
- name = "CVE-2021-27291.patch";
- url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch";
- sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa";
- excludes = ["CHANGES"];
- })
- ];
-
- propagatedBuildInputs = [ docutils ];
-
- # Circular dependency with sphinx
- doCheck = false;
-
- meta = {
- homepage = "https://pygments.org/";
- description = "A generic syntax highlighter";
- license = lib.licenses.bsd2;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix
deleted file mode 100644
index 717b2b5f2780..000000000000
--- a/pkgs/development/python-modules/TurboCheetah/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cheetah
-, nose
-}:
-
-buildPythonPackage rec {
- pname = "TurboCheetah";
- version = "1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c";
- };
-
- propagatedBuildInputs = [ cheetah ];
-
- checkInputs = [ nose ];
-
- meta = {
- description = "TurboGears plugin to support use of Cheetah templates";
- homepage = "http://docs.turbogears.org/TurboCheetah";
- license = lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 6f4bba33ebba..9d6e49cfdf0f 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.19.1";
+ version = "3.19.3";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-mJ121SSoO7v2p+qCF5Va5+ppHQsHcFuyJDpyc6lykRI=";
+ sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index bc71e3721288..907cf155ea10 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -7,6 +7,7 @@
, libusb1
, mock
, pyasn1
+, pythonAtLeast
, pycryptodome
, pytestCheckHook
, rsa
@@ -15,15 +16,15 @@
buildPythonPackage rec {
pname = "adb-shell";
version = "0.4.2";
+ format = "setuptools";
disabled = !isPy3k;
- # pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
- sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
+ hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
};
propagatedBuildInputs = [
@@ -40,7 +41,16 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "adb_shell" ];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # Tests are failing with Python 3.10
+ # https://github.com/JeffLIrion/adb_shell/issues/198
+ "TestAdbDeviceAsync"
+ "TestTcpTransportAsync"
+ ];
+
+ pythonImportsCheck = [
+ "adb_shell"
+ ];
meta = with lib; {
description = "Python implementation of ADB with shell and FileSync functionality";
diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix
index 9685f5c9969d..fd4fb79a5999 100644
--- a/pkgs/development/python-modules/adjusttext/default.nix
+++ b/pkgs/development/python-modules/adjusttext/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "adjusttext";
- version = "0.7.3";
+ version = "0.7.3.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "Phlya";
repo = pname;
rev = version;
- sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw";
+ sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index c63b3b4ffdf8..d80b564ea9cb 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "aenum";
- version = "3.1.5";
+ version = "3.1.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-LrrYWQtqAYPA2Yk1I7RY7c6YeuRTMznFrBhc+sMtrxo=";
+ sha256 = "3ba2c25dd03fbf3992353595be18152e2fb6042f47b526ea66cd5838bb9f1fb6";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index d0de050c86f9..abe6bad71d9a 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage rec {
"test_filename_without_dir"
"test_overwrite"
"test_options"
- ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+ ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) [
# aarch64-only (?) failure, unknown reason so far
# https://github.com/adobe-type-tools/afdko/issues/1425
"test_spec"
diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix
index 8ad6fa98ff6e..b37c04a91779 100644
--- a/pkgs/development/python-modules/afsapi/default.nix
+++ b/pkgs/development/python-modules/afsapi/default.nix
@@ -6,22 +6,29 @@
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "afsapi";
- version = "0.0.4";
+ version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
- owner = "zhelev";
+ owner = "wlcrs";
repo = "python-afsapi";
rev = version;
- sha256 = "aevxhHuRedDs0JxeMlYSKHDQwcIs7miRm4FCtssdE0w=";
+ hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU=";
};
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
propagatedBuildInputs = [
aiohttp
lxml
@@ -42,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of the Frontier Silicon API";
- homepage = "https://github.com/zhelev/python-afsapi";
+ homepage = "https://github.com/wlcrs/python-afsapi";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index ca74671ab81a..b51f5f165624 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,20 +7,25 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-S+ntSC9KySj2njkxEkr7p2TDsBqY0Gf+zzwomnGwSEk=";
+ hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8=";
};
- propagatedBuildInputs = [ pyvex ];
+ propagatedBuildInputs = [
+ pyvex
+ ];
# Tests depend on angr (possibly a circular dependency)
doCheck = false;
+
#pythonImportsCheck = [ "ailment" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix
index 47e8de0f8d26..0a9b8fffae74 100644
--- a/pkgs/development/python-modules/aioapns/default.nix
+++ b/pkgs/development/python-modules/aioapns/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "aioapns";
- version = "2.0.2";
+ version = "2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc";
+ sha256 = "2ce526910bc2514a84b8105abe80508526ceafc0097c89f86bbbc501f8666c99";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 795b50d81166..14ff06324bbf 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -17,7 +17,9 @@
buildPythonPackage rec {
pname = "aioconsole";
version = "0.3.3";
- disabled = pythonOlder "3.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "vxgmichel";
@@ -36,7 +38,13 @@ buildPythonPackage rec {
--replace "--cov aioconsole --count 2" ""
'';
- pythonImportsCheck = [ "aioconsole" ];
+ disabledTests = [
+ "test_interact_syntax_error"
+ ];
+
+ pythonImportsCheck = [
+ "aioconsole"
+ ];
meta = with lib; {
description = "Asynchronous console and interfaces for asyncio";
diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix
index 777c8905c7d5..0eb84fdba662 100644
--- a/pkgs/development/python-modules/aiocurrencylayer/default.nix
+++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiocurrencylayer";
- version = "1.0.2";
+ version = "1.0.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = pname;
rev = version;
- sha256 = "EVqnrMatOk2I6hiCkiT5FOWvMY9LEK8LlSHqi0x9kuQ=";
+ sha256 = "sha256-t2Pcoakk25vtUYajIZVITsrEUSdwwiA3fbdswy3n9P8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix
index 9249df059bf0..92e87e1ab1a3 100644
--- a/pkgs/development/python-modules/aiogithubapi/default.nix
+++ b/pkgs/development/python-modules/aiogithubapi/default.nix
@@ -12,7 +12,8 @@
buildPythonPackage rec {
pname = "aiogithubapi";
- version = "21.11.0";
+ version = "22.1.0";
+ format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,16 +21,9 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw=";
+ sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM=";
};
- postPatch = ''
- # Upstream is releasing with the help of a CI to PyPI, GitHub releases
- # are not in their focus
- substituteInPlace setup.py \
- --replace 'version="main",' 'version="${version}",'
- '';
-
propagatedBuildInputs = [
aiohttp
async-timeout
@@ -42,7 +36,16 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "aiogithubapi" ];
+ postPatch = ''
+ # Upstream is releasing with the help of a CI to PyPI, GitHub releases
+ # are not in their focus
+ substituteInPlace setup.py \
+ --replace 'version="main",' 'version="${version}",'
+ '';
+
+ pythonImportsCheck = [
+ "aiogithubapi"
+ ];
meta = with lib; {
description = "Python client for the GitHub API";
diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix
index fea1956e3311..6e77c5589ec0 100644
--- a/pkgs/development/python-modules/aioharmony/default.nix
+++ b/pkgs/development/python-modules/aioharmony/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "aioharmony";
- version = "0.2.8";
+ version = "0.2.9";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47";
+ sha256 = "sha256-T30pLzPWD+5pb0ShkpNdiBFO45RdiMYgCOSg8rx+t+Y=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 1caf183fef80..a2c3d182be1c 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
- version = "0.6.4";
+ version = "0.6.11";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = version;
- sha256 = "sha256-+W1nsJsiVL4hjtNUyKOsQNyX0Bki/C1FvmoD2OCwqeM=";
+ sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aiohttp-apispec/unstable.nix b/pkgs/development/python-modules/aiohttp-apispec/unstable.nix
deleted file mode 100644
index 73a28de7b40d..000000000000
--- a/pkgs/development/python-modules/aiohttp-apispec/unstable.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
-, aiohttp, webargs, fetchFromGitHub, callPackage
-}:
-
-let
- apispec3 = callPackage ../apispec/3.nix {};
- jinja2 = callPackage ../jinja2/2.nix {};
-in
-buildPythonPackage rec {
- pname = "aiohttp-apispec";
- version = "unstable-2021-21-08";
-
- # unstable so we can use latest webargs
- src = fetchFromGitHub {
- owner = "maximdanilchenko";
- repo = "aiohttp-apispec";
- rev = "cfa19646394480dda289f6b7af19b7d50f245d81";
- sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ=";
- fetchSubmodules = false;
- };
-
- propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ];
-
- pythonImportsCheck = [
- "aiohttp_apispec"
- ];
-
- # Requires pytest-sanic, currently broken in nixpkgs
- doCheck = false;
-
- meta = with lib; {
- description = "Build and document REST APIs with aiohttp and apispec";
- homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
- license = licenses.mit;
- maintainers = [ maintainers.viric ];
- };
-}
diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix
new file mode 100644
index 000000000000..3cd0fe098426
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-retry/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pytest-aiohttp
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "aiohttp-retry";
+ version = "2.5.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "inyutin";
+ repo = "aiohttp_retry";
+ rev = "v${version}";
+ hash = "sha256-jyt4YPn3gSgR1YfHYLs+5VCsjAk9Ij+2m5Kzy51CnLk=";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ pytest-aiohttp
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "aiohttp_retry"
+ ];
+
+ meta = with lib; {
+ description = "Retry client for aiohttp";
+ homepage = "https://github.com/inyutin/aiohttp_retry";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index e782eed49b7f..2a6e8b2c1b86 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "aiohttp_socks";
- sha256 = "sha256-IhXKxIke8/oUt9YA7TQ+0PCmcMI7EOQUKqhis9sgNBo=";
+ sha256 = "2215cac4891ef3fa14b7d600ed343ed0f0a670c23b10e4142aa862b3db20341a";
};
propagatedBuildInputs = [ aiohttp attrs python-socks ];
diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix
index b9b2801f750d..538f628abe66 100644
--- a/pkgs/development/python-modules/aiohwenergy/default.nix
+++ b/pkgs/development/python-modules/aiohwenergy/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aiohwenergy";
- version = "0.4.0";
+ version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "DCSBL";
repo = pname;
rev = version;
- sha256 = "Rs7kD+jN/z0j4KmkitquB+cm2UcYG87YHczZR0A4axI=";
+ sha256 = "006q2kgc28dn43skk2x76d13fp51sy073nm8f2hrxn4wqwkccsx3";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix
index 813eb00b1fb6..4349bf4fccd3 100644
--- a/pkgs/development/python-modules/aioitertools/default.nix
+++ b/pkgs/development/python-modules/aioitertools/default.nix
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
+, fetchpatch
, fetchPypi
+, pythonAtLeast
, pythonOlder
, typing-extensions
, coverage
@@ -19,6 +21,15 @@ buildPythonPackage rec {
sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46";
};
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ (fetchpatch {
+ # Fix TypeError: wait() got an unexpected keyword argument 'loop'
+ # See https://github.com/omnilib/aioitertools/issues/84
+ url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch";
+ sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0=";
+ })
+ ];
+
propagatedBuildInputs = [ typing-extensions ];
checkInputs = [ coverage toml ];
diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix
index ae069ae18266..54e237898447 100644
--- a/pkgs/development/python-modules/aiopvpc/default.nix
+++ b/pkgs/development/python-modules/aiopvpc/default.nix
@@ -33,10 +33,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
- backports-zoneinfo
holidays
tzdata
async-timeout
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ backports-zoneinfo
];
checkInputs = [
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 2a3a2e60be79..a23b1eca77ca 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,14 @@
buildPythonPackage rec {
pname = "aioresponses";
- version = "0.7.2";
+ version = "0.7.3";
+ format = "setuptools";
+
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-guSV0Ri3SJaqW01H4X7/teLMeD5RCuOVzq3l6Hyr6Jo=";
+ sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM=";
};
nativeBuildInputs = [
@@ -39,7 +41,9 @@ buildPythonPackage rec {
"test_pass_through_with_origin_params"
];
- pythonImportsCheck = [ "aioresponses" ];
+ pythonImportsCheck = [
+ "aioresponses"
+ ];
meta = {
description = "A helper to mock/fake web requests in python aiohttp package";
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index 9f2c665f6754..7c3def1ec554 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aioridwell";
- version = "2021.10.0";
+ version = "2021.12.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-h89gfdZvk7H22xAczaPMscTYZu0YeFxvFfL6/Oz2cJw=";
+ sha256 = "sha256-QFUXWleHRMBgaRsMNt2xFb3XcbCNI2kKQHKCBrUuG6Q=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index ddcd11d4eebd..bc6954900ae2 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -4,21 +4,21 @@
, pythonOlder
, pygments
, pytestCheckHook
-, pytest-cov
, uvloop
}:
buildPythonPackage rec {
pname = "aiorun";
- version = "2021.8.1";
+ version = "2021.10.1";
format = "flit";
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-aehYPZ1+GEO+bNSsE5vVgjtVo4MRMH+vNurk+bJ1/Io=";
+ hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8=";
};
propagatedBuildInputs = [
@@ -27,7 +27,6 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest-cov
uvloop
];
@@ -36,7 +35,9 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
- pythonImportsCheck = [ "aiorun" ];
+ pythonImportsCheck = [
+ "aiorun"
+ ];
meta = with lib; {
description = "Boilerplate for asyncio applications";
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index f3bb26c2780e..f1c0c7fb262f 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioshelly";
- version = "1.0.5";
+ version = "1.0.7";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
- sha256 = "sha256-AaEnVMup/sGR3ENtN6NF/CzG05P4Er5LI8mG5LNVzAo=";
+ sha256 = "1jx2m03c8f76nn8r14vk0v7qq2kijgjhqcqwl95kih50cgmj0yzf";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index f4d1541a1398..be6a0cca00f9 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aioswitcher";
- version = "2.0.6";
+ version = "2.0.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "TomerFi";
repo = pname;
rev = version;
- sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4=";
+ sha256 = "05m5jgn8g3kwrp92x3mdfpnpga1jc4whlxx9vlymg0r9s5y84lz5";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
deleted file mode 100644
index 6aa09f70ba3a..000000000000
--- a/pkgs/development/python-modules/alot/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook
-, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
-, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
-}:
-
-buildPythonPackage rec {
- pname = "alot";
- version = "0.10";
- outputs = [ "out" ] ++ lib.optional withManpage "man";
-
- disabled = !isPy3k;
-
- src = fetchFromGitHub {
- owner = "pazz";
- repo = "alot";
- rev = version;
- sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis=";
- };
-
- postPatch = ''
- substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share"
- '';
-
- nativeBuildInputs = lib.optional withManpage sphinx;
-
- propagatedBuildInputs = [
- notmuch2
- urwid
- urwidtrees
- twisted
- python_magic
- configobj
- service-identity
- file
- gpgme
- ];
-
- postBuild = lib.optionalString withManpage "make -C docs man";
-
- checkInputs = [ gawk future mock gnupg procps pytestCheckHook ];
- # some twisted tests need internet access
- disabledTests = [
- "test_env_set"
- "test_no_spawn_no_stdin_attached"
- ];
-
- postInstall = let
- completionPython = python.withPackages (ps: [ ps.configobj ]);
- in lib.optionalString withManpage ''
- mkdir -p $out/man
- cp -r docs/build/man $out/man
- ''
- + ''
- mkdir -p $out/share/{applications,alot}
- cp -r extra/themes $out/share/alot
-
- substituteInPlace extra/completion/alot-completion.zsh \
- --replace "python3" "${completionPython.interpreter}"
- install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
-
- sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
- '';
-
- meta = with lib; {
- homepage = "https://github.com/pazz/alot";
- description = "Terminal MUA using notmuch mail";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ milibopp ];
- };
-}
diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix
new file mode 100644
index 000000000000..1b152e70d7b0
--- /dev/null
+++ b/pkgs/development/python-modules/amaranth-boards/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, amaranth
+, setuptools
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "amaranth-boards";
+ version = "unstable-2021-12-17";
+ # python setup.py --version
+ realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}";
+
+ src = fetchFromGitHub {
+ owner = "amaranth-lang";
+ repo = "amaranth-boards";
+ rev = "8e2615765e255144403431ca95c5cdf6c78eb638";
+ sha256 = "3EOG8SO5xBNevshXMRrxKWoJUbeaVi8ckbkmqd6Tw70=";
+ };
+
+ nativeBuildInputs = [ setuptools-scm ];
+ propagatedBuildInputs = [ setuptools amaranth ];
+
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
+ '';
+
+ # no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Board definitions for Amaranth HDL";
+ homepage = "https://github.com/amaranth-lang/amaranth-boards";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ emily thoughtpolice ];
+ };
+}
diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix
new file mode 100644
index 000000000000..e90137ba22b7
--- /dev/null
+++ b/pkgs/development/python-modules/amaranth-soc/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, amaranth
+, setuptools
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "amaranth-soc";
+ version = "unstable-2021-12-10";
+ # python setup.py --version
+ realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}";
+
+ src = fetchFromGitHub {
+ owner = "amaranth-lang";
+ repo = "amaranth-soc";
+ rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18";
+ sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA=";
+ };
+
+ nativeBuildInputs = [ setuptools-scm ];
+ propagatedBuildInputs = [ setuptools amaranth ];
+
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
+ '';
+
+ meta = with lib; {
+ description = "System on Chip toolkit for Amaranth HDL";
+ homepage = "https://github.com/amaranth-lang/amaranth-soc";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ emily thoughtpolice ];
+ };
+}
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index 0228e7b3185c..99fe555e3f3d 100644
--- a/pkgs/development/python-modules/nmigen/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -18,17 +18,17 @@
}:
buildPythonPackage rec {
- pname = "nmigen";
- version = "unstable-2021-02-09";
+ pname = "amaranth";
+ version = "0.3";
# python setup.py --version
- realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
- owner = "nmigen";
- repo = "nmigen";
- rev = "f7c2b9419f9de450be76a0e9cf681931295df65f";
- sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
+ owner = "amaranth-lang";
+ repo = "amaranth";
+ rev = "39a83f4d995d16364cc9b99da646ff8db6394166";
+ sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
@@ -59,12 +59,12 @@ buildPythonPackage rec {
--replace "pyvcd~=0.2.2" "pyvcd"
'';
- pythonImportsCheck = [ "nmigen" ];
+ pythonImportsCheck = [ "amaranth" ];
meta = with lib; {
- description = "A refreshed Python toolbox for building complex digital hardware";
- homepage = "https://nmigen.info/nmigen";
+ description = "A modern hardware definition language and toolchain based on Python";
+ homepage = "https://amaranth-lang.org/docs/amaranth";
license = licenses.bsd2;
- maintainers = with maintainers; [ emily ];
+ maintainers = with maintainers; [ emily thoughtpolice ];
};
}
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 6156472896ad..c23c1d012da4 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -1,24 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
+{ lib
+, buildPythonPackage
+, case
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, vine
+}:
buildPythonPackage rec {
pname = "amqp";
- version = "5.0.6";
+ version = "5.0.9";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2";
+ hash = "sha256-Hl9wdCTlRAeMoZbnKuahSIfOdOAr0Sa+VLfAPJcb7xg=";
};
- propagatedBuildInputs = [ vine ];
+ propagatedBuildInputs = [
+ vine
+ ];
+
+ checkInputs = [
+ case
+ pytestCheckHook
+ ];
- checkInputs = [ pytestCheckHook case ];
disabledTests = [
- "test_rmq.py" # requires network access
+ # Requires network access
+ "test_rmq.py"
+ ];
+
+ pythonImportsCheck = [
+ "amqp"
];
meta = with lib; {
homepage = "https://github.com/celery/py-amqp";
description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
- license = licenses.lgpl21;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index d61140081ef1..7458ca11e99d 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -2,9 +2,11 @@
, buildPythonPackage
, docopt
, fetchFromGitHub
+, fetchpatch
, hypothesis
, passlib
, poetry-core
+, pytest-logdog
, pytest-asyncio
, pytestCheckHook
, pythonOlder
@@ -15,23 +17,21 @@
buildPythonPackage rec {
pname = "amqtt";
- version = "0.10.0";
+ version = "unstable-2022-01-11";
format = "pyproject";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yakifo";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I=";
+ rev = "8961b8fff57007a5d9907b98bc555f0519974ce9";
+ hash = "sha256-3uwz4RSoa6KRC8mlVfeIMLPH6F2kOJjQjjXCrnVX0Jo=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'websockets = "^9.0"' 'websockets = "^10.0"'
- '';
-
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
propagatedBuildInputs = [
docopt
@@ -43,22 +43,30 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
+ pytest-logdog
pytest-asyncio
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"'
+ '';
+
disabledTestPaths = [
# Test are not ported from hbmqtt yet
"tests/test_cli.py"
"tests/test_client.py"
];
- disabledTests = [
- # Requires network access
- "test_connect_tcp"
- ];
+ preCheck = ''
+ # Some tests need amqtt
+ export PATH=$out/bin:$PATH
+ '';
- pythonImportsCheck = [ "amqtt" ];
+ pythonImportsCheck = [
+ "amqtt"
+ ];
meta = with lib; {
description = "Python MQTT client and broker implementation";
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 4468dfabecd0..55153f5cf44d 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -22,6 +22,7 @@
, pycparser
, pythonOlder
, pyvex
+, sympy
, sqlalchemy
, rpyc
, sortedcontainers
@@ -45,18 +46,18 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A=";
+ hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA=";
};
- setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
-
propagatedBuildInputs = [
ailment
archinfo
@@ -75,20 +76,24 @@ buildPythonPackage rec {
progressbar2
protobuf
psutil
- sqlalchemy
pycparser
pyvex
- sqlalchemy
rpyc
sortedcontainers
+ sqlalchemy
+ sympy
unicorn'
];
+ setupPyBuildFlags = lib.optionals stdenv.isLinux [
+ "--plat-name"
+ "linux"
+ ];
+
# Tests have additional requirements, e.g., pypcode and angr binaries
# cle is executing the tests with the angr binaries
doCheck = false;
- # See http://angr.io/api-doc/
pythonImportsCheck = [
"angr"
"claripy"
diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix
index bad2bb01bf8a..25781fbcd3a1 100644
--- a/pkgs/development/python-modules/angrcli/default.nix
+++ b/pkgs/development/python-modules/angrcli/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fmagin";
repo = "angr-cli";
rev = "v${version}";
- sha256 = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
+ hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 7989a06b60ef..20272b35ca8b 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -9,14 +9,16 @@
buildPythonPackage rec {
pname = "angrop";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8M3d8lG7jDNgICjzjFRi9Wl2I7aYI5b5IvjEhixsk9k=";
+ hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA=";
};
propagatedBuildInputs = [
@@ -28,7 +30,10 @@ buildPythonPackage rec {
# Tests have additional requirements, e.g., angr binaries
# cle is executing the tests with the angr binaries already and is a requirement of angr
doCheck = false;
- pythonImportsCheck = [ "angrop" ];
+
+ pythonImportsCheck = [
+ "angrop"
+ ];
meta = with lib; {
description = "ROP gadget finder and chain builder";
diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix
index 9ea365079451..c9ed6bd90ede 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/pkgs/development/python-modules/annexremote/default.nix
@@ -2,33 +2,41 @@
, isPy3k
, buildPythonPackage
, fetchFromGitHub
-, future
-, mock
+, pytestCheckHook
, nose
+, pythonOlder
}:
buildPythonPackage rec {
pname = "annexremote";
version = "1.6.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # use fetchFromGitHub instead of fetchPypi because the test suite of
- # the package is not included into the PyPI tarball
src = fetchFromGitHub {
- rev = "v${version}";
owner = "Lykos153";
repo = "AnnexRemote";
+ rev = "v${version}";
sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi";
};
- propagatedBuildInputs = [ future ];
+ checkInputs = [
+ nose
+ ];
+
+ checkPhase = ''
+ nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory"
+ '';
- checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock;
- checkPhase = "nosetests -v";
+ pythonImportsCheck = [
+ "annexremote"
+ ];
meta = with lib; {
description = "Helper module to easily develop git-annex remotes";
homepage = "https://github.com/Lykos153/AnnexRemote";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ montag451 ];
};
}
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 2fac5e8a021e..0523b775dab3 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
- version = "5.3.1";
+ version = "5.3.2";
disabled = isPy27;
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-fXvHS5uQxZgr5cJ0wq/LpbgHPsiMznk/q0Y/5kGKJfY=";
+ sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix
new file mode 100644
index 000000000000..b74c7e321799
--- /dev/null
+++ b/pkgs/development/python-modules/ansimarkup/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, colorama
+}:
+
+buildPythonPackage rec {
+ pname = "ansimarkup";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "gvalkov";
+ repo = "python-ansimarkup";
+ rev = "v${version}";
+ sha256 = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4=";
+ };
+
+ propagatedBuildInputs = [ colorama ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "ansimarkup" ];
+
+ meta = with lib; {
+ description = "An XML-like markup for producing colored terminal text.";
+ homepage = "https://github.com/gvalkov/python-ansimarkup";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index c666d89b2bfa..2fe6fe08ef18 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -13,12 +13,13 @@
, colorlog
, croniter
, cryptography
+, dataclasses
, dill
, flask
-, flask-appbuilder
-, flask-caching
, flask_login
, flask_wtf
+, flask-appbuilder
+, flask-caching
, GitPython
, graphviz
, gunicorn
@@ -47,6 +48,7 @@
, python-nvd3
, python-slugify
, python3-openid
+, pythonOlder
, pyyaml
, rich
, setproctitle
@@ -63,7 +65,6 @@
, mkYarnPackage
}:
let
-
version = "2.1.4";
airflow-src = fetchFromGitHub rec {
@@ -107,6 +108,8 @@ buildPythonPackage rec {
inherit version;
src = airflow-src;
+ disabled = pythonOlder "3.6";
+
propagatedBuildInputs = [
alembic
argcomplete
@@ -130,7 +133,6 @@ buildPythonPackage rec {
httpx
iso8601
importlib-resources
- importlib-metadata
inflection
itsdangerous
jinja2
@@ -163,6 +165,10 @@ buildPythonPackage rec {
termcolor
unicodecsv
werkzeug
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ dataclasses
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-metadata
];
buildInputs = [
@@ -178,24 +184,22 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.cfg \
- --replace "importlib_resources~=1.4" "importlib_resources" \
- --replace "importlib_metadata~=1.7" "importlib_metadata" \
- --replace "tenacity~=6.2.0" "tenacity" \
- --replace "pyjwt<2" "pyjwt" \
- --replace "flask>=1.1.0, <2.0" "flask" \
- --replace "flask-login>=0.3, <0.5" "flask-login" \
- --replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
- --replace "jinja2>=2.10.1, <2.12.0" "jinja2" \
--replace "attrs>=20.0, <21.0" "attrs" \
--replace "cattrs~=1.1, <1.7.0" "cattrs" \
- --replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
+ --replace "colorlog>=4.0.2, <6.0" "colorlog" \
+ --replace "croniter>=0.3.17, <1.1" "croniter" \
--replace "docutils<0.17" "docutils" \
- --replace "sqlalchemy>=1.3.18, <1.4" "sqlalchemy" \
- --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
- --replace "werkzeug~=1.0, >=1.0.1" "werkzeug" \
+ --replace "flask-login>=0.3, <0.5" "flask-login" \
+ --replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
+ --replace "flask>=1.1.0, <2.0" "flask" \
+ --replace "importlib_resources~=1.4" "importlib_resources" \
--replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \
+ --replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
+ --replace "pyjwt<2" "pyjwt" \
--replace "python-slugify>=3.0.0,<5.0" "python-slugify" \
- --replace "colorlog>=4.0.2, <6.0" "colorlog"
+ --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
+ --replace "tenacity~=6.2.0" "tenacity" \
+ --replace "werkzeug~=1.0, >=1.0.1" "werkzeug"
substituteInPlace tests/core/test_core.py \
--replace "/bin/bash" "${stdenv.shell}"
@@ -205,19 +209,21 @@ buildPythonPackage rec {
--replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
'';
- # allow for gunicorn processes to have access to python packages
- makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ];
+ # allow for gunicorn processes to have access to Python packages
+ makeWrapperArgs = [
+ "--prefix PYTHONPATH : $PYTHONPATH"
+ ];
preCheck = ''
- export HOME=$(mktemp -d)
- export AIRFLOW_HOME=$HOME
- export AIRFLOW__CORE__UNIT_TEST_MODE=True
- export AIRFLOW_DB="$HOME/airflow.db"
- export PATH=$PATH:$out/bin
-
- airflow version
- airflow db init
- airflow db reset -y
+ export HOME=$(mktemp -d)
+ export AIRFLOW_HOME=$HOME
+ export AIRFLOW__CORE__UNIT_TEST_MODE=True
+ export AIRFLOW_DB="$HOME/airflow.db"
+ export PATH=$PATH:$out/bin
+
+ airflow version
+ airflow db init
+ airflow db reset -y
'';
pytestFlagsArray = [
@@ -225,7 +231,7 @@ buildPythonPackage rec {
];
disabledTests = lib.optionals stdenv.isDarwin [
- "bash_operator_kill" # psutil.AccessDenied
+ "bash_operator_kill" # psutil.AccessDenied
];
postInstall = ''
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
new file mode 100644
index 000000000000..44748f2fdb05
--- /dev/null
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -0,0 +1,145 @@
+{ buildPythonPackage
+, cloudpickle
+, crcmod
+, cython
+, dill
+, fastavro
+, fetchFromGitHub
+, freezegun
+, grpcio
+, grpcio-tools
+, hdfs
+, httplib2
+, lib
+, mock
+, mypy-protobuf
+, numpy
+, oauth2client
+, orjson
+, pandas
+, parameterized
+, proto-plus
+, protobuf
+, psycopg2
+, pyarrow
+, pydot
+, pyhamcrest
+, pymongo
+, pytest-timeout
+, pytest-xdist
+, pytestCheckHook
+, python
+, python-dateutil
+, pytz
+, pyyaml
+, requests
+, requests-mock
+, setuptools
+, sqlalchemy
+, tenacity
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+ pname = "apache-beam";
+ version = "2.35.0";
+
+ src = fetchFromGitHub {
+ owner = "apache";
+ repo = "beam";
+ rev = "v${version}";
+ sha256 = "0qxkas33d8i6yj133plnadbfm74ak7arn7ldpziyiwdav3hj68sy";
+ };
+
+ patches = [
+ ./relax-deps.patch
+ # Fixes https://issues.apache.org/jira/browse/BEAM-9324
+ ./fix-cython.patch
+ ];
+
+ sourceRoot = "source/sdks/python";
+
+ nativeBuildInputs = [
+ cython
+ grpcio-tools
+ mypy-protobuf
+ ];
+
+ propagatedBuildInputs = [
+ cloudpickle
+ crcmod
+ cython
+ dill
+ fastavro
+ grpcio
+ hdfs
+ httplib2
+ numpy
+ oauth2client
+ orjson
+ proto-plus
+ protobuf
+ pyarrow
+ pydot
+ pymongo
+ python-dateutil
+ pytz
+ requests
+ setuptools
+ typing-extensions
+ ];
+
+ pythonImportsCheck = [
+ "apache_beam"
+ ];
+
+ checkInputs = [
+ freezegun
+ mock
+ pandas
+ parameterized
+ psycopg2
+ pyhamcrest
+ pytest-timeout
+ pytest-xdist
+ pytestCheckHook
+ pyyaml
+ requests-mock
+ sqlalchemy
+ tenacity
+ ];
+
+ # Make sure we're running the tests for the actually installed
+ # package, so that cython's .so files are available.
+ preCheck = "cd $out/lib/${python.libPrefix}/site-packages";
+
+ disabledTestPaths = [
+ # These tests depend on the availability of specific servers backends.
+ "apache_beam/runners/portability/flink_runner_test.py"
+ "apache_beam/runners/portability/samza_runner_test.py"
+ "apache_beam/runners/portability/spark_runner_test.py"
+ ];
+
+ disabledTests = [
+ # The reasons of failures for these tests are unclear.
+ # They reproduce in Docker with Ubuntu 22.04
+ # (= they're not `nixpkgs`-specific) but given the upstream uses
+ # quite elaborate testing infra with containers and multiple
+ # different runners - I don't expect them to help debugging these
+ # when running via our (= custom from their PoV) testing infra.
+ "testBuildListUnpack"
+ "testBuildTupleUnpack"
+ "testBuildTupleUnpackWithCall"
+ "test_convert_bare_types"
+ "test_incomparable_default"
+ "test_pardo_type_inference"
+ "test_with_main_session"
+ ];
+
+ meta = with lib; {
+ description = "Unified model for defining both batch and streaming data-parallel processing pipelines";
+ homepage = "https://beam.apache.org/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/apache-beam/fix-cython.patch b/pkgs/development/python-modules/apache-beam/fix-cython.patch
new file mode 100644
index 000000000000..f73d75b4b84a
--- /dev/null
+++ b/pkgs/development/python-modules/apache-beam/fix-cython.patch
@@ -0,0 +1,41 @@
+diff --git a/apache_beam/runners/worker/operations.py b/apache_beam/runners/worker/operations.py
+index 3464c5750c..5921c72b90 100644
+--- a/apache_beam/runners/worker/operations.py
++++ b/apache_beam/runners/worker/operations.py
+@@ -69,18 +69,6 @@ if TYPE_CHECKING:
+ from apache_beam.runners.worker.statesampler import StateSampler
+ from apache_beam.transforms.userstate import TimerSpec
+
+-# Allow some "pure mode" declarations.
+-try:
+- import cython
+-except ImportError:
+-
+- class FakeCython(object):
+- @staticmethod
+- def cast(type, value):
+- return value
+-
+- globals()['cython'] = FakeCython()
+-
+ _globally_windowed_value = GlobalWindows.windowed_value(None)
+ _global_window_type = type(_globally_windowed_value.windows[0])
+
+@@ -149,7 +137,7 @@ class ConsumerSet(Receiver):
+ # type: (WindowedValue) -> None
+ self.update_counters_start(windowed_value)
+ for consumer in self.consumers:
+- cython.cast(Operation, consumer).process(windowed_value)
++ consumer.process(windowed_value)
+ self.update_counters_finish()
+
+ def try_split(self, fraction_of_remainder):
+@@ -345,7 +333,7 @@ class Operation(object):
+
+ def output(self, windowed_value, output_index=0):
+ # type: (WindowedValue, int) -> None
+- cython.cast(Receiver, self.receivers[output_index]).receive(windowed_value)
++ self.receivers[output_index].receive(windowed_value)
+
+ def add_receiver(self, operation, output_index=0):
+ # type: (Operation, int) -> None
diff --git a/pkgs/development/python-modules/apache-beam/relax-deps.patch b/pkgs/development/python-modules/apache-beam/relax-deps.patch
new file mode 100644
index 000000000000..67bd38f5e7cc
--- /dev/null
+++ b/pkgs/development/python-modules/apache-beam/relax-deps.patch
@@ -0,0 +1,20 @@
+diff --git a/setup.py b/setup.py
+index 9429459622..2727b3becb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -136,12 +136,12 @@ REQUIRED_PACKAGES = [
+ # version of dill. It is best to use the same version of dill on client and
+ # server, therefore list of allowed versions is very narrow.
+ # See: https://github.com/uqfoundation/dill/issues/341.
+- 'dill>=0.3.1.1,<0.3.2',
++ 'dill>=0.3.1.1',
+ 'fastavro>=0.21.4,<2',
+ 'grpcio>=1.29.0,<2',
+ 'hdfs>=2.1.0,<3.0.0',
+- 'httplib2>=0.8,<0.20.0',
+- 'numpy>=1.14.3,<1.21.0',
++ 'httplib2>=0.8',
++ 'numpy>=1.14.3',
+ 'pymongo>=3.8.0,<4.0.0',
+ 'oauth2client>=2.0.1,<5',
+ 'protobuf>=3.12.2,<4',
diff --git a/pkgs/development/python-modules/apispec/3.nix b/pkgs/development/python-modules/apispec/3.nix
deleted file mode 100644
index e60a440df3f4..000000000000
--- a/pkgs/development/python-modules/apispec/3.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pyyaml
-, prance
-, marshmallow
-, pytestCheckHook
-, mock
-, openapi-spec-validator
-}:
-
-buildPythonPackage rec {
- pname = "apispec";
- version = "3.3.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
- };
-
- propagatedBuildInputs = [
- pyyaml
- prance
- ];
-
- postPatch = ''
- rm tests/test_ext_marshmallow.py
- '';
-
- checkInputs = [
- openapi-spec-validator
- marshmallow
- mock
- pytestCheckHook
- ];
-
- pythonImportsCheck = [
- "apispec"
- ];
-
- meta = with lib; {
- description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
- homepage = "https://github.com/marshmallow-code/apispec";
- license = licenses.mit;
- maintainers = [ maintainers.viric ];
- };
-}
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 4ee3add12b13..1b67f4921e26 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,12 +1,24 @@
-{ lib, fetchPypi, buildPythonPackage
-, fetchpatch, configobj, six, traitsui
-, pytestCheckHook, tables, pandas
-, pythonOlder, importlib-resources
+{ lib
+, buildPythonPackage
+, configobj
+, fetchpatch
+, fetchPypi
+, importlib-resources
+, pandas
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, tables
+, traits
+, traitsui
}:
buildPythonPackage rec {
pname = "apptools";
version = "5.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -24,7 +36,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
configobj
- six
+ traits
traitsui
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
@@ -40,10 +52,22 @@ buildPythonPackage rec {
export HOME=$TMP
'';
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/enthought/apptools/issues/303
+ "apptools/io/h5/tests/test_dict_node.py"
+ "apptools/io/h5/tests/test_file.py"
+ "apptools/io/h5/tests/test_table_node.py"
+ ];
+
+
+ pythonImportsCheck = [
+ "apptools"
+ ];
+
meta = with lib; {
- description = "Set of packages that Enthought has found useful in creating a number of applications.";
+ description = "Set of packages that Enthought has found useful in creating a number of applications";
homepage = "https://github.com/enthought/apptools";
- maintainers = with maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ knedlsepp ];
};
}
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index ce7bfb1668f1..beae6671be4a 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -3,17 +3,21 @@
, fetchFromGitHub
, pytestCheckHook
, nose
+, pythonOlder
}:
buildPythonPackage rec {
pname = "archinfo";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VLFbjKX7WXWoJCS9hYwtEikGC48gRg7E24D9Un+/gdc=";
+ hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0=";
};
checkInputs = [
@@ -21,7 +25,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "archinfo" ];
+ pythonImportsCheck = [
+ "archinfo"
+ ];
meta = with lib; {
description = "Classes with architecture-specific information";
diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix
new file mode 100644
index 000000000000..3a1861bbd182
--- /dev/null
+++ b/pkgs/development/python-modules/asgineer/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "asgineer";
+ version = "0.8.1";
+
+ # PyPI tarball doesn't include tests directory
+ src = fetchFromGitHub {
+ owner = "almarklein";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ requests
+ ];
+
+ meta = with lib; {
+ description = "A really thin ASGI web framework";
+ license = licenses.bsd2;
+ homepage = "https://asgineer.readthedocs.io";
+ maintainers = [ maintainers.matthiasbeyer ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix
index 1d6c7b45d15b..7c5c113dbd80 100644
--- a/pkgs/development/python-modules/aspell-python/default.nix
+++ b/pkgs/development/python-modules/aspell-python/default.nix
@@ -1,29 +1,57 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, aspell, aspellDicts, python }:
+{ lib
+, aspell
+, aspellDicts
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, pythonAtLeast
+}:
buildPythonPackage rec {
pname = "aspell-python";
version = "1.15";
+ format = "setuptools";
+
disabled = isPy27;
src = fetchPypi {
- inherit version;
pname = "aspell-python-py3";
+ inherit version;
extension = "tar.bz2";
- sha256 = "13dk3jrvqmfvf2w9b8afj37d8bh32kcx295lyn3z7r8qch792hi0";
+ hash = "sha256-IEKRDmQY5fOH9bQk0dkUAy7UzpBOoZW4cNtVvLMcs40=";
};
- buildInputs = [ aspell ];
+ buildInputs = [
+ aspell
+ ];
- checkPhase = ''
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ preCheck = ''
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
export HOME=$(mktemp -d)
- ${python.interpreter} test/unittests.py
'';
- pythonImportsCheck = [ "aspell" ];
+ pytestFlagsArray = [
+ "test/unittests.py"
+ ];
+
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/WojciechMula/aspell-python/issues/22
+ "test_add"
+ "test_get"
+ "test_saveall"
+ ];
+
+ pythonImportsCheck = [
+ "aspell"
+ ];
meta = with lib; {
- description = "Python wrapper for aspell (C extension and python version)";
+ description = "Python wrapper for aspell (C extension and Python version)";
homepage = "https://github.com/WojciechMula/aspell-python";
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index dd772e007cc1..4bcfa7d8e671 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "asteval";
- version = "0.9.25";
+ version = "0.9.26";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "newville";
repo = pname;
rev = version;
- sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs=";
+ sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix
index bd9dca338fcd..a3ea5cd4cf2f 100644
--- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix
+++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, findutils
, pytestCheckHook
}:
@@ -16,7 +17,12 @@ buildPythonPackage rec {
patches = [ ./permissions.patch ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [ findutils pytestCheckHook ];
+
+ # avoid import mismatch errors, as conftest.py is copied to build dir
+ pytestFlagsArray = [
+ "extension_helpers"
+ ];
pythonImportsCheck = [
"extension_helpers"
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 31d615f5314b..f148f34e00e9 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
- version = "3.8.0";
+ version = "3.18.0";
src = fetchFromGitHub {
owner = "atlassian-api";
repo = pname;
rev = version;
- sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc=";
+ sha256 = "0akrwvq1f87lyckzwgpd16aljsbqjwwliv7j9czal7f216nbkvv6";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix
index cb87b9027f04..3a9834ec8657 100644
--- a/pkgs/development/python-modules/attrdict/default.nix
+++ b/pkgs/development/python-modules/attrdict/default.nix
@@ -1,19 +1,56 @@
-{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, coverage
+, pythonOlder
+, nose
+, pytestCheckHook
+, six
+}:
buildPythonPackage rec {
pname = "attrdict";
version = "2.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70";
+ hash = "sha256-NckGmLVcaDlGCRF3F3qenAcToIYPDgSf69cmSczXe3A=";
};
- propagatedBuildInputs = [ coverage nose six ];
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ coverage
+ nose
+ ];
+
+ postPatch = ''
+ substituteInPlace attrdict/merge.py \
+ --replace "from collections" "from collections.abc"
+ substituteInPlace attrdict/mapping.py \
+ --replace "from collections" "from collections.abc"
+ substituteInPlace attrdict/default.py \
+ --replace "from collections" "from collections.abc"
+ substituteInPlace attrdict/mixins.py \
+ --replace "from collections" "from collections.abc"
+ '';
+
+ # Tests are not shipped and source is not tagged
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "attrdict"
+ ];
meta = with lib; {
description = "A dict with attribute-style access";
homepage = "https://github.com/bcj/AttrDict";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index a304fae19df1..7a9722be28ce 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "aws-xray-sdk";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "90c2fcc982a770e86d009a4c3d2b5c3e372da91cb8284d982bae458e2c0bb268";
+ sha256 = "b0cd972db218d4d8f7b53ad806fc6184626b924c4997ae58fc9f2a8cd1281568";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index e3125343dffa..a8cc3a34f94a 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "awscrt";
- version = "0.12.6";
+ version = "0.13.0";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752";
+ sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
index 68b44ea5a5d5..70161d3fd6a0 100644
--- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
@@ -1,22 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pythonOlder
}:
buildPythonPackage rec {
pname = "AWSIoTPythonSDK";
- version = "1.4.9";
+ version = "1.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-iot-device-sdk-python";
rev = "v${version}";
- sha256 = "0mbppz1lnia4br5vjz1l4z4vw47y3bzcfpckzhs9lxhj4vq6d001";
+ sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh";
};
- # Project has no tests
+ # Module has no tests
doCheck = false;
- pythonImportsCheck = [ "AWSIoTPythonSDK" ];
+
+ pythonImportsCheck = [
+ "AWSIoTPythonSDK"
+ ];
meta = with lib; {
description = "Python SDK for connecting to AWS IoT";
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index b4dc461ea88c..9a128d813489 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -15,14 +15,14 @@
}:
buildPythonPackage rec {
- version = "1.20.1";
+ version = "1.21.1";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "21d06311c9c373e394ed9f9db035306773334a0181932e265889eca34d778d17";
+ sha256 = "88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix
index 95910a66e82e..de3ddb803aa5 100644
--- a/pkgs/development/python-modules/azure-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-eventhub/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "azure-eventhub";
- version = "5.6.1";
+ version = "5.7.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40=";
+ sha256 = "6ac364e5f1c5b376604c3b5a25ad0be5e3a5f96368f590e05b47e6745f1006ee";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
index 2b2327d9f0ec..7b088728b275 100644
--- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "2.1.0";
+ version = "3.0.0";
pname = "azure-mgmt-apimanagement";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94";
+ sha256 = "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 2685d8803b89..545eef7f6d89 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-applicationinsights";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b";
+ sha256 = "c5f831ff09573247579c0dabe7854324620d176143b28cc4ef2e71ca49791dcc";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index a89e803220d7..e0f5ff579bd6 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "23.1.0";
+ version = "24.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3";
+ sha256 = "04e60fd3e73fc036ad74497e81277faedb7e048c8c1d7511d37ad7471b4cfc50";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index ddd05fa6a0fe..8afcde620194 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "8.2.0";
+ version = "9.0.0";
pname = "azure-mgmt-containerregistry";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b";
+ sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index cb1d15179b2d..bfd0b6196954 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "d2a3cfe844bd9e51499b81bba7510e2c8df4fc3a40a7059e6224ed043d65a786";
+ sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index 2023eb0ab567..e61cd221db9b 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-eventgrid";
- version = "10.0.0";
+ version = "10.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2";
+ sha256 = "4da3bf142d31bc25d80ee26641b95b7f52eb1baf4f326b9954e9f0613944ef3c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index 404caf4ebf5b..005f5ca8f0c0 100644
--- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
@@ -1,26 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
+, azure-mgmt-core
, msrest
, msrestazure
}:
buildPythonPackage rec {
- version = "0.4.0";
+ version = "1.0.0";
pname = "azure-mgmt-imagebuilder";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733";
+ sha256 = "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430";
extension = "zip";
};
- propagatedBuildInputs = [ azure-common msrest msrestazure ];
+ propagatedBuildInputs = [
+ azure-common
+ azure-mgmt-core
+ msrest
+ msrestazure
+ ];
# no tests included
doCheck = false;
- pythonImportsCheck = [ "azure.common" "azure.mgmt.imagebuilder" ];
+ pythonImportsCheck = [
+ "azure.common"
+ "azure.mgmt.core"
+ "azure.mgmt.imagebuilder"
+ ];
meta = with lib; {
description = "Microsoft Azure Image Builder Client Library for Python";
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index dbe22478d7bd..edf8057e503c 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "5.1.0";
+ version = "6.0.1";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "306088088ee10e86c4cf24cc82a9ca619db5cdfc0da3fa207d00ec7f77f06e8e";
+ sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index 64dcf44345ef..71257c46c4f2 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-subscription";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "70ec6e3395549c434bfd981f8f76cb8b6863339bad9b31924c1510af661dbf45";
+ sha256 = "157bd9123a5814473a9cd131832ea614c478548722ec01f47b35d778dc307d55";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index 1c9cb2e94570..ad7930016ab0 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-web";
- version = "5.0.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24";
+ sha256 = "a58750df23d5d4cb8eff283a93312e933ee3ef4272324576005c3dc8c22ce944";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index bf474c031438..b4e37c33fef9 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "azure-servicebus";
- version = "7.4.0";
+ version = "7.5.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4=";
+ sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix
index 283a31466620..64e7a8f63d32 100644
--- a/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-servicefabric/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "azure-servicefabric";
- version = "8.0.0.0";
+ version = "8.2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d";
+ sha256 = "f49c8759447970817b9b2d3d4b97439765dcf75ba01b6066ce96b605052fbb23";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index 4be6c43ba9ab..b24417b325ab 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-synapse-artifacts";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3f782c9b590b8ae43678c6e003df8ca8cca675832039d270b0b7437ff01557fd";
+ sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
index abf6774ddef2..84618e8da1d8 100644
--- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
+++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "backports-entry-points-selectable";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
pname = "backports.entry_points_selectable";
inherit version;
- sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a";
+ sha256 = "914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
index 336c6b2e5134..a20d0c696cd6 100644
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -1,12 +1,12 @@
{ lib
, buildPythonPackage
-, isPy27
+, pythonOlder
, fetchFromGitHub
, pytestCheckHook
-, unittest2
, future
, numpy
, pillow
+, fetchpatch
, scipy
, scikit-learn
, scikitimage
@@ -16,27 +16,53 @@
buildPythonPackage rec {
pname = "batchgenerators";
version = "0.21";
+ format = "setuptools";
- disabled = isPy27;
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "MIC-DKFZ";
repo = pname;
rev = "v${version}";
- sha256 = "16bk4r0q3m2c9fawpmj4l7kz0x3fyv1spb92grf44gmyricq3jdb";
-
+ hash = "sha256-q8mBWcy+PkJcfiKtq8P2bnTw56FE1suVS0zUgUEmc5k=";
};
propagatedBuildInputs = [
- future numpy pillow scipy scikit-learn scikitimage threadpoolctl
+ future
+ numpy
+ pillow
+ scipy
+ scikit-learn
+ scikitimage
+ threadpoolctl
+ ];
+
+ checkInputs = [
+ pytestCheckHook
];
- checkInputs = [ pytestCheckHook unittest2 ];
+ patches = [
+ # Remove deprecated unittest2, https://github.com/MIC-DKFZ/batchgenerators/pull/78
+ (fetchpatch {
+ name = "remove-unittest2.patch";
+ url = "https://github.com/MIC-DKFZ/batchgenerators/commit/87a9437057df8a7550aa3b3eaf840871cc0d5cef.patch";
+ sha256 = "sha256-vozBK7g2dLxx9din/R2vU28Mm+LoGAO/BmQlt/ShmEo=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace '"unittest2",' ""
+ '';
+
+ pythonImportsCheck = [
+ "batchgenerators"
+ ];
- meta = {
+ meta = with lib; {
description = "2D and 3D image data augmentation for deep learning";
homepage = "https://github.com/MIC-DKFZ/batchgenerators";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ bcdarwin ];
+ license = licenses.asl20;
+ maintainers = with maintainers; [ bcdarwin ];
};
}
diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix
new file mode 100644
index 000000000000..a07551197b84
--- /dev/null
+++ b/pkgs/development/python-modules/bbox/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pyquaternion
+, numpy
+}:
+
+buildPythonPackage rec {
+ pname = "bbox";
+ version = "0.9.2";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw=";
+ };
+
+ propagatedBuildInputs = [ pyquaternion numpy ];
+
+ pythonImportsCheck = [ "bbox" ];
+
+ meta = with lib; {
+ description = "Python library for 2D/3D bounding boxes";
+ homepage = "https://github.com/varunagrawal/bbox";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix
index d69b2d6ce4ca..2c24578f4581 100644
--- a/pkgs/development/python-modules/bibtexparser/default.nix
+++ b/pkgs/development/python-modules/bibtexparser/default.nix
@@ -1,33 +1,49 @@
{ lib
-, buildPythonPackage, fetchFromGitHub
-, future, pyparsing
-, glibcLocales, nose, unittest2
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, pyparsing
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "bibtexparser";
- version = "1.1.0";
+ version = "1.2.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # PyPI tarball does not ship tests
src = fetchFromGitHub {
owner = "sciunto-org";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c";
+ hash = "sha256-M9fDI28Yq0uUHPx51wiuRPmRTLkjVqj7ixapbSftnJc=";
};
- propagatedBuildInputs = [ future pyparsing ];
+ propagatedBuildInputs = [
+ future
+ pyparsing
+ ];
- checkInputs = [ nose unittest2 glibcLocales ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- LC_ALL="en_US.UTF-8" nosetests
+ postPatch = ''
+ # https://github.com/sciunto-org/python-bibtexparser/pull/259
+ substituteInPlace bibtexparser/tests/test_crossref_resolving.py \
+ --replace "import unittest2 as unittest" "import unittest"
'';
- meta = {
- description = "Bibtex parser for python 2.7 and 3.3 and newer";
+ pythonImportsCheck = [
+ "bibtexparser"
+ ];
+
+ meta = with lib; {
+ description = "Bibtex parser for Python";
homepage = "https://github.com/sciunto-org/python-bibtexparser";
- license = with lib.licenses; [ gpl3 bsd3 ];
- maintainers = with lib.maintainers; [ fridh ];
+ license = with licenses; [ lgpl3Only /* or */ bsd3 ];
+ maintainers = with maintainers; [ fridh ];
};
}
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 79aca1e4a99f..f02bef97ba34 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,16 +1,18 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPyPy
, pytestCheckHook
, case
, psutil
+, pythonOlder
}:
buildPythonPackage rec {
pname = "billiard";
version = "3.6.4.0";
- disabled = isPyPy;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -23,9 +25,14 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [
+ "billiard"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/celery/billiard";
description = "Python multiprocessing fork with improvements and bugfixes";
+ homepage = "https://github.com/celery/billiard";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index 004b7d4e3e09..0f6334d27926 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
- version = "0.8.7";
+ version = "0.8.10";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
- hash = "sha256-nLZdaV341mULXIngkEqiLQeg4G2NDFGNg/AUozgJe74=";
+ hash = "sha256-xt21mcXcucUhJlqwDLrAHvQLg9++uc/cX5Sy+Sppsbo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 43cc2dbd5bce..9372248fede1 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765";
+ sha256 = "60285184cb02fdba5e1cc8605ac84e150a50f940e9383ab43564e5258d1f47bb";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index d159811efbcc..431edac75dfa 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "bleak";
- version = "0.13.0";
+ version = "0.14.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1vnwk36qfws9amqrdaynf63dcj2gzxm0ns1l75hrczmd5j2ic1zb";
+ sha256 = "b449cc63f769c2d219c67e23ffb9f3a5b5f23eb2d68d05878743dbed83a14360";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix
deleted file mode 100644
index af129f4aa5dc..000000000000
--- a/pkgs/development/python-modules/blist/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchpatch
-, fetchPypi
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "blist";
- version = "1.3.6";
- disabled = isPyPy;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
- };
-
-
- patches = [
- # Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78
- (fetchpatch {
- url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch";
- sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y";
- })
-
- # Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91
- (fetchpatch {
- url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch";
- sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga";
- })
- ];
-
- meta = with lib; {
- homepage = "http://stutzbachenterprises.com/blist/";
- description = "A list-like type with better asymptotic performance and similar performance on small lists";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 0986a5dc7c43..f884e164d639 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -3,40 +3,53 @@
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
}:
buildPythonPackage rec {
pname = "boltons";
version = "20.2.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # No tests in PyPi Tarball
src = fetchFromGitHub {
owner = "mahmoud";
repo = "boltons";
rev = version;
- sha256 = "0vw0h0z81gfxgjfijqiza92ic0siv9xy65mklgj5d0dzr1k9waw8";
+ hash = "sha256-iCueZsi/gVbko7MW43vaUQMWRVI/YhmdfN29gD6AgG8=";
};
- patches = [
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ # pprint has no attribute _safe_repr, https://github.com/mahmoud/boltons/issues/294
(fetchpatch {
- url = "https://github.com/mahmoud/boltons/commit/754afddf141ea26956c88c7e13fe5e7ca7942654.patch";
- sha256 = "14kcq8pl4pmgcnlnmj1sh1yrksgym0kn0kgz2648g192svqkbpz8";
+ name = "fix-pprint-attribute.patch";
+ url = "https://github.com/mahmoud/boltons/commit/270e974975984f662f998c8f6eb0ebebd964de82.patch";
+ sha256 = "sha256-pZLfr6SRCw2aLwZeYaX7bzfJeZC4cFUILEmnVsKR6zc=";
})
];
- checkInputs = [ pytestCheckHook ];
disabledTests = [
- # This test is broken without this PR, which has not yet been merged
+ # This test is broken without this PR. Merged but not released
# https://github.com/mahmoud/boltons/pull/283
- "test_frozendict_ior"
+ "test_frozendict"
+ ];
+
+ pythonImportsCheck = [
+ "boltons"
];
meta = with lib; {
homepage = "https://github.com/mahmoud/boltons";
- description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library";
+ description = "Constructs, recipes, and snippets extending the Python standard library";
longDescription = ''
- Boltons is a set of over 220 BSD-licensed, pure-Python utilities
- in the same spirit as — and yet conspicuously missing from — the
+ Boltons is a set of over 200 BSD-licensed, pure-Python utilities
+ in the same spirit as - and yet conspicuously missing from - the
standard library, including:
- Atomic file saving, bolted on with fileutils
diff --git a/pkgs/development/python-modules/bootstrapped-pip/2.nix b/pkgs/development/python-modules/bootstrapped-pip/2.nix
deleted file mode 100644
index 2fc8b8b8d4b7..000000000000
--- a/pkgs/development/python-modules/bootstrapped-pip/2.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib, stdenv, python, makeWrapper, unzip
-, pipInstallHook
-, setuptoolsBuildHook
-, wheel, pip, setuptools
-}:
-
-stdenv.mkDerivation rec {
- pname = "pip";
- inherit (pip) version;
- name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
-
- srcs = [ wheel.src pip.src setuptools.src ];
- sourceRoot = ".";
-
- dontUseSetuptoolsBuild = true;
- dontUsePipInstall = true;
-
- # Should be propagatedNativeBuildInputs
- propagatedBuildInputs = [
- # Override to remove dependencies to prevent infinite recursion.
- (pipInstallHook.override{pip=null;})
- (setuptoolsBuildHook.override{setuptools=null; wheel=null;})
- ];
-
- postPatch = ''
- mkdir -p $out/bin
- '';
-
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ python ];
-
- dontBuild = true;
-
- installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
- export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
- '' + ''
- # Give folders a known name
- mv pip* pip
- mv setuptools* setuptools
- mv wheel* wheel
- # Set up PYTHONPATH. The above folders need to be on PYTHONPATH
- # $out is where we are installing to and takes precedence
- export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$(pwd)/wheel:$PYTHONPATH"
-
- echo "Building setuptools wheel..."
- pushd setuptools
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
- popd
-
- echo "Building wheel wheel..."
- pushd wheel
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
- popd
-
- echo "Building pip wheel..."
- pushd pip
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
- popd
- '';
-
- meta = {
- description = "Version of pip used for bootstrapping";
- license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
- homepage = pip.meta.homepage;
- };
-}
diff --git a/pkgs/development/python-modules/boto3/1_17.nix b/pkgs/development/python-modules/boto3/1_17.nix
deleted file mode 100644
index c8b8210f6503..000000000000
--- a/pkgs/development/python-modules/boto3/1_17.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, botocore
-, jmespath
-, s3transfer
-, futures ? null
-, docutils
-, nose
-, mock
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "boto3";
- version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb";
- };
-
- propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
- checkInputs = [ docutils nose mock ];
-
- checkPhase = ''
- runHook preCheck
- # This method is not in mock. It might have appeared in some versions.
- sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \
- tests/unit/resources/test_factory.py
- nosetests -d tests/unit --verbose
- runHook postCheck
- '';
-
- # Network access
- doCheck = false;
-
- pythonImportsCheck = [ "boto3" ];
-
- meta = {
- homepage = "https://github.com/boto/boto3";
- license = lib.licenses.asl20;
- description = "AWS SDK for Python";
- longDescription = ''
- Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
- Python, which allows Python developers to write software that makes use of
- services like Amazon S3 and Amazon EC2.
- '';
- };
-}
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index bf26eca41b64..af358a61f181 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.20.13"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.20.21"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "bbf53a077d6a0575ddec8026f0475ca6ee6f41b227914bf315bf3e049a3d653a";
+ sha256 = "2fb05cbe81b9ce11d9394fc6c4ffa5fd1cceb114dc1d2887dc61081707e44522";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/1_20.nix b/pkgs/development/python-modules/botocore/1_20.nix
deleted file mode 100644
index d05c2decf497..000000000000
--- a/pkgs/development/python-modules/botocore/1_20.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python-dateutil
-, jmespath
-, docutils
-, ordereddict
-, simplejson
-, mock
-, nose
-, urllib3
-}:
-
-buildPythonPackage rec {
- pname = "botocore";
- version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab";
- };
-
- propagatedBuildInputs = [
- python-dateutil
- jmespath
- docutils
- ordereddict
- simplejson
- urllib3
- ];
-
- checkInputs = [ mock nose ];
-
- checkPhase = ''
- nosetests -v
- '';
-
- # Network access
- doCheck = false;
-
- pythonImportsCheck = [ "botocore" ];
-
- meta = with lib; {
- homepage = "https://github.com/boto/botocore";
- license = licenses.asl20;
- description = "A low-level interface to a growing number of Amazon Web Services";
- };
-}
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index b34dbfbac98c..43fad7124553 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.23.14"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.23.21"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-6NUsvy5zxiaM8sIH9H48+z7eCYP5PotZZ0tUYo5+8fE=";
+ sha256 = "d7f8e82cba38aa1e66015cab0a5ca3204503e90afc4695e97228e28329a14c04";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix
new file mode 100644
index 000000000000..a3f0db80fafe
--- /dev/null
+++ b/pkgs/development/python-modules/boxx/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, xvfb-run
+, matplotlib
+, scikitimage
+, numpy
+, pandas
+, imageio
+, snakeviz
+, fn
+, pyopengl
+, seaborn
+, pytorch
+, torchvision
+}:
+
+buildPythonPackage rec {
+ pname = "boxx";
+ version = "0.9.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4=";
+ };
+
+ propagatedBuildInputs = [
+ matplotlib
+ scikitimage
+ numpy
+ pandas
+ imageio
+ snakeviz
+ fn
+ pyopengl
+ seaborn
+ ];
+
+ pythonImportsCheck = [ "boxx" ];
+ checkInputs = [
+ xvfb-run
+ pytorch
+ torchvision
+ ];
+
+ checkPhase = ''
+ xvfb-run ${python.interpreter} -m unittest
+ '';
+
+ meta = with lib; {
+ description = "Tool-box for efficient build and debug in Python. Especially for Scientific Computing and Computer Vision.";
+ homepage = "https://github.com/DIYer22/boxx";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/bpycv/bpycv-test.py b/pkgs/development/python-modules/bpycv/bpycv-test.py
new file mode 100644
index 000000000000..94e1bb122c77
--- /dev/null
+++ b/pkgs/development/python-modules/bpycv/bpycv-test.py
@@ -0,0 +1,76 @@
+# based on https://github.com/DIYer22/bpycv/blob/c576e01622d87eb3534f73bf1a5686bd2463de97/example/ycb_demo.py
+import bpy
+import bpycv
+
+import os
+import glob
+import random
+
+example_data_dir = os.environ['BPY_EXAMPLE_DATA']
+
+models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj")))
+cat_id_to_model_path = dict(enumerate(sorted(models), 1))
+
+distractors = sorted(glob.glob(os.path.join(example_data_dir, "distractor", "*.obj")))
+
+bpycv.clear_all()
+bpy.context.scene.frame_set(1)
+bpy.context.scene.render.engine = "CYCLES"
+bpy.context.scene.cycles.samples = 32
+bpy.context.scene.render.resolution_y = 1024
+bpy.context.scene.render.resolution_x = 1024
+
+# A transparency stage for holding rigid body
+stage = bpycv.add_stage(transparency=True)
+
+bpycv.set_cam_pose(cam_radius=1, cam_deg=45)
+
+hdri_dir = os.path.join(example_data_dir, "background_and_light")
+hdri_manager = bpycv.HdriManager(
+ hdri_dir=hdri_dir, download=False
+) # if download is True, will auto download .hdr file from HDRI Haven
+hdri_path = hdri_manager.sample()
+bpycv.load_hdri_world(hdri_path, random_rotate_z=True)
+
+# load 5 objects
+for index in range(5):
+ cat_id = random.choice(list(cat_id_to_model_path))
+ model_path = cat_id_to_model_path[cat_id]
+ obj = bpycv.load_obj(model_path)
+ obj.location = (
+ random.uniform(-0.2, 0.2),
+ random.uniform(-0.2, 0.2),
+ random.uniform(0.1, 0.3),
+ )
+ obj.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)]
+ # set each instance a unique inst_id, which is used to generate instance annotation.
+ obj["inst_id"] = cat_id * 1000 + index
+ with bpycv.activate_obj(obj):
+ bpy.ops.rigidbody.object_add()
+
+# load 6 distractors
+for index in range(6):
+ distractor_path = random.choice(distractors)
+ target_size = random.uniform(0.1, 0.3)
+ distractor = bpycv.load_distractor(distractor_path, target_size=target_size)
+ distractor.location = (
+ random.uniform(-0.2, 0.2),
+ random.uniform(-0.2, 0.2),
+ random.uniform(0.1, 0.3),
+ )
+ distractor.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)]
+ with bpycv.activate_obj(distractor):
+ bpy.ops.rigidbody.object_add()
+
+# run pyhsic engine for 20 frames
+for i in range(20):
+ bpy.context.scene.frame_set(bpy.context.scene.frame_current + 1)
+
+# render image, instance annoatation and depth in one line code
+result = bpycv.render_data()
+
+dataset_dir = "./dataset"
+result.save(dataset_dir=dataset_dir, fname="0", save_blend=True)
+print(f'Save to "{dataset_dir}"')
+print(f'Open "{dataset_dir}/vis/" to see visualize result.')
+
diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix
new file mode 100644
index 000000000000..7a88a4078f0b
--- /dev/null
+++ b/pkgs/development/python-modules/bpycv/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchFromGitHub
+, fetchurl
+, writeText
+, blender
+, minexr
+, beautifulsoup4
+, zcs
+, requests
+, opencv3
+, boxx
+}:
+
+buildPythonPackage rec {
+ pname = "bpycv";
+ version = "0.2.43";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-6LXhKuNkX3yKeZARLXmOVNAUQhJghtzKhnszJ1G/a8U=";
+ };
+
+ propagatedBuildInputs = [
+ beautifulsoup4
+ minexr
+ zcs
+ requests
+ opencv3
+ boxx
+ ];
+
+ postPatch = ''
+ sed -i 's/opencv-python//g' requirements.txt
+ '';
+
+ # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
+ checkInputs = [ blender ];
+ checkPhase = let
+ bpycv_example_data = fetchFromGitHub {
+ owner = "DIYer22";
+ repo = "bpycv_example_data";
+ sha256 = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q=";
+ rev = "6ce0e65c107d572011394da16ffdf851e988dbb4";
+ };
+ in ''
+ TEMPDIR=$(mktemp -d)
+ pushd $TEMPDIR
+ cp -r ${bpycv_example_data} example_data
+ chmod +w -R example_data
+ BPY_EXAMPLE_DATA=${bpycv_example_data} blender -b -P ${./bpycv-test.py}
+ popd
+ '';
+
+ meta = with lib; {
+ description = "Computer vision utils for Blender";
+ homepage = "https://github.com/DIYer22/bpycv";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix
index f670bebc8ed3..6db952347752 100644
--- a/pkgs/development/python-modules/bsblan/default.nix
+++ b/pkgs/development/python-modules/bsblan/default.nix
@@ -8,6 +8,7 @@
, pytest-asyncio
, pytest-cov
, pytest-mock
+, pythonOlder
, aiohttp
, attrs
, cattrs
@@ -16,13 +17,16 @@
buildPythonPackage rec {
pname = "bsblan";
- version = "0.4.1";
+ version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
rev = "v.${version}";
- sha256 = "0vyg9vsrs34jahlav83qp2djv81p3ks31qz4qh46zdij2nx7l1fv";
+ sha256 = "1j41y2njnalcsp1vjqwl508yp3ki82lv8108ijz52hprhrq4fffb";
};
propagatedBuildInputs = [
@@ -42,7 +46,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "bsblan" ];
+ pythonImportsCheck = [
+ "bsblan"
+ ];
meta = with lib; {
description = "Python client for BSB-Lan";
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index ba8d15909f21..f1f7f0e81bd2 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -54,6 +54,8 @@ buildPythonPackage rec {
pytestFlagsArray = [
"-n"
"$NIX_BUILD_CORES"
+ "-W"
+ "ignore::DeprecationWarning"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 8e26517ba218..cc4e19d6beb7 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -12,16 +12,67 @@
, cairo
, cffi
, numpy
-, withXcffib ? false, xcffib
+, withXcffib ? false
+, xcffib
, python
, glib
, gdk-pixbuf
-}@args:
+}:
+
+buildPythonPackage rec {
+ pname = "cairocffi";
+ version = "1.3.0";
-import ./generic.nix ({
- version = "1.2.0";
- sha256 = "sha256-mpebUAxkyBef7ChvM36P5kTsovLNBYYM4LYtJfIuoUA=";
- dlopen_patch = ./dlopen-paths.patch;
disabled = pythonOlder "3.5";
- inherit withXcffib;
-} // args)
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-EIo6fLCeIDvdhQHZuq2R14bSBFYb1x6TZOizSJfEe5E=";
+ };
+
+ LC_ALL = "en_US.UTF-8";
+
+ # checkPhase require at least one 'normal' font and one 'monospace',
+ # otherwise glyph tests fails
+ FONTCONFIG_FILE = makeFontsConf {
+ fontDirectories = [ freefont_ttf ];
+ };
+
+ propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
+ propagatedNativeBuildInputs = [ cffi ];
+
+ # pytestCheckHook does not work
+ checkInputs = [ numpy pytest glibcLocales ];
+
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "pytest-runner" "" \
+ --replace "pytest-cov" "" \
+ --replace "pytest-flake8" "" \
+ --replace "pytest-isort" "" \
+ --replace "--flake8 --isort" ""
+ '';
+
+ checkPhase = ''
+ py.test $out/${python.sitePackages}
+ '';
+
+ patches = [
+ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
+ (substituteAll {
+ src = ./dlopen-paths.patch;
+ ext = stdenv.hostPlatform.extensions.sharedLibrary;
+ cairo = cairo.out;
+ glib = glib.out;
+ gdk_pixbuf = gdk-pixbuf.out;
+ })
+ ./fix_test_scaled_font.patch
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/SimonSapin/cairocffi";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ description = "cffi-based cairo bindings for Python";
+ };
+}
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix
deleted file mode 100644
index 004cf8ae7841..000000000000
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ version
-, sha256
-, dlopen_patch
-, disabled ? false
-, ...
-}@args:
-
-with args;
-
-buildPythonPackage rec {
- pname = "cairocffi";
- inherit version disabled;
-
- src = fetchPypi {
- inherit pname version sha256;
- };
-
- LC_ALL = "en_US.UTF-8";
-
- # checkPhase require at least one 'normal' font and one 'monospace',
- # otherwise glyph tests fails
- FONTCONFIG_FILE = makeFontsConf {
- fontDirectories = [ freefont_ttf ];
- };
-
- propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
- propagatedNativeBuildInputs = [ cffi ];
-
- # pytestCheckHook does not work
- checkInputs = [ numpy pytest glibcLocales ];
-
- postPatch = ''
- substituteInPlace setup.cfg \
- --replace "pytest-runner" "" \
- --replace "pytest-cov" "" \
- --replace "pytest-flake8" "" \
- --replace "pytest-isort" "" \
- --replace "--flake8 --isort" ""
- '';
-
- checkPhase = ''
- py.test $out/${python.sitePackages}
- '';
-
- patches = [
- # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
- (substituteAll {
- src = dlopen_patch;
- ext = stdenv.hostPlatform.extensions.sharedLibrary;
- cairo = cairo.out;
- glib = glib.out;
- gdk_pixbuf = gdk-pixbuf.out;
- })
- ./fix_test_scaled_font.patch
- ];
-
- meta = with lib; {
- homepage = "https://github.com/SimonSapin/cairocffi";
- license = licenses.bsd3;
- maintainers = with maintainers; [];
- description = "cffi-based cairo bindings for Python";
- };
-}
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 188ab9cb5622..a68d73e1242c 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,39 +1,75 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, future
+, hypothesis
+, parameterized
+, msgpack
+, pyserial
+, pytest-timeout
+, pytestCheckHook
, pythonOlder
-, aenum
+, typing-extensions
, wrapt
-, typing ? null
-, pyserial
-, nose
-, mock
-, hypothesis
-, future
-, pytest
- }:
+}:
buildPythonPackage rec {
pname = "python-can";
- version = "3.3.4";
+ version = "unstable-2022-01-11";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449";
+ src = fetchFromGitHub {
+ owner = "hardbyte";
+ repo = pname;
+ rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b";
+ hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0=";
};
- propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
- checkInputs = [ nose mock pytest hypothesis future ];
+ propagatedBuildInputs = [
+ msgpack
+ pyserial
+ typing-extensions
+ wrapt
+ ];
- # Add the scripts to PATH
- checkPhase = ''
- PATH=$out/bin:$PATH pytest -c /dev/null
+ checkInputs = [
+ future
+ hypothesis
+ parameterized
+ pytest-timeout
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace tox.ini \
+ --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" ""
+ '';
+
+ disabledTestPaths = [
+ # We don't support all interfaces
+ "test/test_interface_canalystii.py"
+ ];
+
+ disabledTests = [
+ # Tests require access socket
+ "BasicTestUdpMulticastBusIPv4"
+ "BasicTestUdpMulticastBusIPv6"
+ ];
+
+ preCheck = ''
+ export PATH="$PATH:$out/bin";
'';
+ pythonImportsCheck = [
+ "can"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/hardbyte/python-can";
description = "CAN support for Python";
- license = licenses.lgpl3;
- maintainers = with maintainers; [ sorki ];
+ homepage = "python-can.readthedocs.io";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ fab sorki ];
};
}
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index d36f6805cc3f..d131e4001c94 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "canmatrix";
- version = "0.9.3";
+ version = "0.9.5";
# uses fetchFromGitHub as PyPi release misses test/ dir
src = fetchFromGitHub {
owner = "ebroecker";
repo = pname;
rev = version;
- sha256 = "sha256-9FupG1VmROgsxYhsafQYPPqG0xEOAYYK8QDOIBNzE0Y=";
+ sha256 = "0x8x8kbg4gyzi0ia9657xygp0mqfii76b67fsx76d31bqsdvlda5";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index ecba8f9cc394..c4d4e8892018 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -4,7 +4,6 @@
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
-, unittest2
}:
buildPythonPackage rec {
@@ -27,7 +26,6 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- unittest2
];
pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix
index 3f95d9e22afc..36efc1aab3bc 100644
--- a/pkgs/development/python-modules/case/default.nix
+++ b/pkgs/development/python-modules/case/default.nix
@@ -1,20 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi
-, six, nose, unittest2, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pythonOlder
+, pytestCheckHook
+, six
+}:
buildPythonPackage rec {
pname = "case";
version = "1.5.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1";
};
- propagatedBuildInputs = [ six nose unittest2 mock ];
+ propagatedBuildInputs = [
+ nose
+ six
+ ];
+
+ # No real unittests, only coverage
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "case"
+ ];
meta = with lib; {
homepage = "https://github.com/celery/case";
- description = "unittests utilities";
+ description = "Utilities for unittests handling";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix
index a62dcbd249a5..7105e360561e 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -2,13 +2,16 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
+, pythonAtLeast
, pythonOlder
, typing-extensions
+, zipp
}:
buildPythonPackage rec {
pname = "catalogue";
version = "2.0.6";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,16 +22,27 @@ buildPythonPackage rec {
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
typing-extensions
+ zipp
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/explosion/catalogue/issues/27
+ "test_entry_points"
+ ];
- pythonImportsCheck = [ "catalogue" ];
+ pythonImportsCheck = [
+ "catalogue"
+ ];
meta = with lib; {
description = "Tiny library for adding function or object registries";
homepage = "https://github.com/explosion/catalogue";
changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index cdd646fed147..eabb3521416e 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -7,6 +7,7 @@
, click-didyoumean
, click-plugins
, click-repl
+, dnspython
, fetchPypi
, kombu
, moto
@@ -22,14 +23,14 @@
buildPythonPackage rec {
pname = "celery";
- version = "5.2.1";
+ version = "5.2.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808";
+ hash = "sha256-4s1BZnrZfU9qL0Zy0cam662hlMYZJTBYtfI3BKqtqoI=";
};
propagatedBuildInputs = [
@@ -46,6 +47,7 @@ buildPythonPackage rec {
checkInputs = [
boto3
case
+ dnspython
moto
pymongo
pytest-celery
@@ -54,6 +56,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace requirements/default.txt \
+ --replace "setuptools>=59.1.1,<59.7.0" "setuptools"
+ '';
+
disabledTestPaths = [
# test_eventlet touches network
"t/unit/concurrency/test_eventlet.py"
@@ -75,6 +82,6 @@ buildPythonPackage rec {
description = "Distributed task queue";
homepage = "https://github.com/celery/celery/";
license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 4262efb1a317..8bf70f95c0f8 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.1.0";
+ version = "2.1.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
- sha256 = "sha256-zQoG7clqDAxwJIt0AQcj8kKGODL61ODc4inP2Ll+Jt8=";
+ sha256 = "sha256-S3sxYCGMg/O5ICr9z4NqjmpPCF7e5F8G2q2EX4bRN+8=";
};
nativeBuildInputs = [
@@ -35,7 +35,6 @@ buildPythonPackage rec {
backoff
requests
rich
- ] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
@@ -50,7 +49,7 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml \
--replace 'backoff = "^1.11.1"' 'backoff = "*"' \
--replace 'requests = ">=2.26.0"' 'requests = "*"' \
- --replace 'rich = "^10.6.0"' 'rich = "*"'
+ --replace 'rich = "^10.16.2"' 'rich = "*"'
substituteInPlace pytest.ini \
--replace "--cov" ""
'';
diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix
new file mode 100644
index 000000000000..f198d8b058dd
--- /dev/null
+++ b/pkgs/development/python-modules/cepa/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchPypi, python, mock }:
+
+buildPythonPackage rec {
+ pname = "cepa";
+ version = "1.8.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no=";
+ };
+
+ postPatch = ''
+ rm test/unit/installation.py
+ sed -i "/test.unit.installation/d" test/settings.cfg
+ # https://github.com/torproject/stem/issues/56
+ sed -i '/MOCK_VERSION/d' run_tests.py
+ '';
+
+ checkInputs = [ mock ];
+
+ checkPhase = ''
+ touch .gitignore
+ ${python.interpreter} run_tests.py -u
+ '';
+
+ meta = with lib; {
+ description = "Controller library that allows applications to interact with Tor";
+ homepage = "https://github.com/onionshare/cepa";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ lourkeur ];
+ };
+}
diff --git a/pkgs/development/python-modules/certifi/python2.nix b/pkgs/development/python-modules/certifi/python2.nix
deleted file mode 100644
index 529d5b1fb996..000000000000
--- a/pkgs/development/python-modules/certifi/python2.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, fetchPypi
-, buildPythonPackage
-, python3
-}:
-
-let
- inherit (python3.pkgs) certifi;
-
-in buildPythonPackage rec {
- pname = "certifi";
- version = "2019.11.28";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f";
- };
-
- postPatch = ''
- cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem
- '';
-
- pythonImportsCheck = [ "certifi" ];
-
- # no tests implemented
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/certifi/python-certifi";
- description = "Python package for providing Mozilla's CA Bundle";
- license = licenses.isc;
- maintainers = with maintainers; [ ]; # NixOps team
- };
-}
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 4a409cb41e03..94a4ea5e10f2 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -23,13 +23,13 @@
buildPythonPackage rec {
pname = "cfn-lint";
- version = "0.56.2";
+ version = "0.56.3";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = "cfn-python-lint";
rev = "v${version}";
- sha256 = "0wpsj719r0p122qmi3nznzqnxqb0nx53isg9fma75894pvq2v5wc";
+ sha256 = "12r0zxwidf4vdbbpzlhlmgc2as5bn45yf663f00iv6px0glq02zs";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix
deleted file mode 100644
index 5f6fe0a672a7..000000000000
--- a/pkgs/development/python-modules/chardet/2.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch
-, pytest, pytest-runner, hypothesis }:
-
-buildPythonPackage rec {
- pname = "chardet";
- version = "3.0.4";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
- };
-
- patches = [
- # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174
- (fetchpatch {
- url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch";
- sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q";
- })
- ];
-
- checkInputs = [ pytest pytest-runner hypothesis ];
-
- meta = with lib; {
- homepage = "https://github.com/chardet/chardet";
- description = "Universal encoding detector";
- license = licenses.lgpl2;
- maintainers = with maintainers; [ domenkozar ];
- };
-}
diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index 0e80ee1a41e4..28e777e8fdd2 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "chart-studio";
- version = "5.4.0";
+ version = "5.5.0";
# chart-studio was split from plotly
src = fetchFromGitHub {
owner = "plotly";
repo = "plotly.py";
rev = "v${version}";
- sha256 = "1ay9dlblxkx3pxqmizj2am9gf60j1pl6ir23yj7chg8dbafdbv8p";
+ sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51";
};
sourceRoot = "source/packages/python/chart-studio";
diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix
deleted file mode 100644
index 1cee46fa7252..000000000000
--- a/pkgs/development/python-modules/cheetah/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, markdown
-, isPy3k
-, TurboCheetah
-}:
-
-buildPythonPackage rec {
- pname = "cheetah";
- version = "2.4.4";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550";
- };
-
- propagatedBuildInputs = [ markdown ];
-
- doCheck = false; # Circular dependency
-
- checkInputs = [
- TurboCheetah
- ];
-
- meta = {
- homepage = "http://www.cheetahtemplate.org/";
- description = "A template engine and code generation tool";
- license = lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 0c6f83ea71db..01bbfe8841b7 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,73 +1,99 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
-, setuptools-scm
-, cheroot, portend, more-itertools, zc_lockfile, routes
+{ lib
+, stdenv
+, buildPythonPackage
+, cheroot
+, fetchPypi
, jaraco_collections
-, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
-, fetchpatch
+, more-itertools
+, objgraph
+, pathpy
+, portend
+, pytest-forked
+, pytest-services
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, requests-toolbelt
+, routes
+, setuptools-scm
+, simplejson
+, zc_lockfile
}:
buildPythonPackage rec {
pname = "cherrypy";
- version = "18.6.0";
+ version = "18.6.1";
+ format = "setuptools";
- disabled = !isPy3k;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "CherryPy";
inherit version;
- sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
+ hash = "sha256-8z6HKG57PjCeBOciXY5JOC2dd3PmCSJB1/YTiTxWNJU=";
};
- patches = [
- # 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
- (fetchpatch {
- url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
- sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
- })
- # 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
- (fetchpatch {
- url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
- sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
- })
- # 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
- (fetchpatch {
- url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
- sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
- })
+ nativeBuildInputs = [
+ setuptools-scm
];
- nativeBuildInputs = [ setuptools-scm ];
-
propagatedBuildInputs = [
# required
- cheroot portend more-itertools zc_lockfile
+ cheroot
+ portend
+ more-itertools
+ zc_lockfile
jaraco_collections
# optional
routes
+ simplejson
];
checkInputs = [
- objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
+ objgraph
+ pathpy
+ pytest-forked
+ pytest-services
+ pytestCheckHook
+ requests-toolbelt
];
- # Keyboard interrupt ends test suite run
- # daemonize and autoreload tests have issue with sockets within sandbox
- # Disable doctest plugin because times out
- checkPhase = ''
- substituteInPlace pytest.ini --replace "--doctest-modules" ""
- pytest \
- -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
- --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
- --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
- ${lib.optionalString stdenv.isDarwin
- "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
+ preCheck = ''
+ # Disable doctest plugin because times out
+ substituteInPlace pytest.ini \
+ --replace "--doctest-modules" "-vvv"
+ sed -i "/--cov/d" pytest.ini
'';
+ pytestFlagsArray = [
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
+ disabledTests = [
+ # Keyboard interrupt ends test suite run
+ "KeyboardInterrupt"
+ # daemonize and autoreload tests have issue with sockets within sandbox
+ "daemonize"
+ "Autoreload"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_block"
+ ];
+
+ disabledTestPaths = lib.optionals stdenv.isDarwin [
+ "cherrypy/test/test_config_server.py"
+ ];
+
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [
+ "cherrypy"
+ ];
+
meta = with lib; {
+ description = "Object-oriented HTTP framework";
homepage = "https://www.cherrypy.org";
- description = "A pythonic, object-oriented HTTP framework";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/chiabip158/default.nix b/pkgs/development/python-modules/chiabip158/default.nix
index f2c309593610..59a2170e6e83 100644
--- a/pkgs/development/python-modules/chiabip158/default.nix
+++ b/pkgs/development/python-modules/chiabip158/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "chiabip158";
- version = "1.0";
+ version = "1.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-dG6A4n30uPswQWY/Wmi75HK4ZMCDNr9Lt05FRWEPYV8=";
+ hash = "sha256-2iQeiQl/CLq2zwo/mUKBwIwV5wlNYUdUfENGNxeDMU8=";
};
nativeBuildInputs = [ cmake setuptools-scm ];
diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix
index 42bf21dd5216..f4047c26f5cf 100644
--- a/pkgs/development/python-modules/chiapos/default.nix
+++ b/pkgs/development/python-modules/chiapos/default.nix
@@ -2,6 +2,7 @@
, substituteAll
, buildPythonPackage
, fetchPypi
+, catch2
, cmake
, cxxopts
, ghc_filesystem
@@ -14,12 +15,12 @@
buildPythonPackage rec {
pname = "chiapos";
- version = "1.0.6";
+ version = "1.0.8";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA=";
+ sha256 = "64529b7f03e9ec0c1b9be7c7c1f30d4498e5d931ff2dbb10a9cc4597029d69f0";
};
patches = [
@@ -27,6 +28,7 @@ buildPythonPackage rec {
(substituteAll {
src = ./dont_fetch_dependencies.patch;
inherit cxxopts ghc_filesystem;
+ catch2_src = catch2.src;
pybind11_src = pybind11.src;
})
];
diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
index 85b7560f5d0d..05bd212e9a6c 100644
--- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b757b70..fcce055 100644
+index 5d7862b..c2d06a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
@@ -29,3 +29,13 @@ index b757b70..fcce055 100644
)
FetchContent_MakeAvailable(gulrak)
+@@ -150,8 +147,7 @@ ENDIF()
+
+ FetchContent_Declare(
+ Catch2
+- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+- GIT_TAG v2.13.7
++ SOURCE_DIR @catch2_src@
+ )
+ FetchContent_MakeAvailable(Catch2)
+
diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix
index 012a4055a01c..9b4bc575cab2 100644
--- a/pkgs/development/python-modules/chiavdf/default.nix
+++ b/pkgs/development/python-modules/chiavdf/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "chiavdf";
- version = "1.0.3";
+ version = "1.0.4";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-XbmK7ZJnUy3Zg9XWt0t/Qb2k5qIlu4vIbxdDFYFjFPI=";
+ hash = "sha256-i6ylxtw1dMtylS4m0mz6rATU1trbMpcmsB2WhD++CeM=";
};
patches = [
diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix
index 5c8306c27fe9..4aa20a237110 100644
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@@ -15,7 +15,6 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
- --replace "protobuf~=3.13.0" "protobuf" \
--replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev"
'';
@@ -29,4 +28,10 @@ buildPythonPackage rec {
freezegun
pytestCheckHook
];
+
+ disabledTests = [
+ # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient'
+ "test_get_engine_sampler_explicit_project_id"
+ "test_get_engine_sampler"
+ ];
}
diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix
index 662eaef5579b..70333fb47a9a 100644
--- a/pkgs/development/python-modules/cirq-rigetti/default.nix
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@@ -40,7 +40,9 @@ buildPythonPackage rec {
--replace "httpx~=0.15.5" "httpx" \
--replace "idna~=2.10" "idna" \
--replace "pyjwt~=1.7.1" "pyjwt" \
- --replace "qcs-api-client~=0.8.0" "qcs-api-client"
+ --replace "qcs-api-client~=0.8.0" "qcs-api-client" \
+ --replace "iso8601~=0.1.14" "iso8601" \
+ --replace "pydantic~=1.8.2" "pydantic"
# Remove outdated test
rm cirq_rigetti/service_test.py
'';
diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix
deleted file mode 100644
index d34534e3eb80..000000000000
--- a/pkgs/development/python-modules/cjson/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }:
-
-buildPythonPackage rec {
- pname = "python-cjson";
- version = "1.2.2";
- disabled = isPy3k || isPyPy;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "3006c2c218297be3448dc793218e0b15d20fe9839775521bfc294fc6aa24972b";
- };
-
- meta = with lib; {
- description = "A very fast JSON encoder/decoder for Python";
- homepage = "https://ag-projects.com/";
- license = licenses.lgpl2;
- };
-}
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index e15a062a8939..409164cf830e 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "ckcc-protocol";
- version = "1.1.0";
+ version = "1.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab";
+ sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f";
};
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index d96d684e3e18..f026f39ccf0f 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,21 +13,18 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-66dc0y4mu5S5PtTx2fRkBdpNlH53ZpTiKyM3s0OUamw=";
+ sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk=";
};
- # Use upstream z3 implementation
- postPatch = ''
- substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" ""
- '';
-
propagatedBuildInputs = [
cachetools
decorator
@@ -41,7 +38,15 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "claripy" ];
+ postPatch = ''
+ # Use upstream z3 implementation
+ substituteInPlace setup.py \
+ --replace "z3-solver>=4.8.5.0" ""
+ '';
+
+ pythonImportsCheck = [
+ "claripy"
+ ];
meta = with lib; {
description = "Python abstraction layer for constraint solvers";
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 212267b00752..abe85946260f 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.1.10913";
+ version = "9.1.11508";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -29,13 +29,15 @@ in
buildPythonPackage rec {
pname = "cle";
inherit version;
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-z8hBOqeI7T6Rov00OySDBdzUQ6jeBRseE7sz8VfIJmk=";
+ hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index a9e3daa8372b..15f0249fd801 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "cli_helpers";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "733f65d8c921e0cffa8f7ae4c8735bd7ecdffec383c5246f647ddd0fddb33448";
+ sha256 = "sha256-DMwc/Noaxk3H7YPXATBVzxnll50p5Wwh87aS3gFVWq4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/click/7.nix b/pkgs/development/python-modules/click/7.nix
deleted file mode 100644
index fcbd4d0981af..000000000000
--- a/pkgs/development/python-modules/click/7.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }:
-
-buildPythonPackage rec {
- pname = "click";
- version = "7.1.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
- };
-
- postPatch = ''
- substituteInPlace src/click/_unicodefun.py \
- --replace "'locale'" "'${locale}/bin/locale'"
- '';
-
- checkInputs = [ pytestCheckHook ];
-
- meta = with lib; {
- homepage = "https://click.palletsprojects.com/";
- description = "Create beautiful command line interfaces in Python";
- longDescription = ''
- A Python package for creating beautiful command line interfaces in a
- composable way, with as little code as necessary.
- '';
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index 4f9a562543b9..75c4513d1e3a 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -7,7 +7,6 @@
, attrs
, od
, docutils
-, repeated_test
, pygments
, unittest2
, pytestCheckHook
@@ -22,11 +21,13 @@ buildPythonPackage rec {
sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d";
};
+ # repeated_test no longer exists in nixpkgs
+ # also see: https://github.com/epsy/clize/issues/74
+ doCheck = false;
checkInputs = [
pytestCheckHook
python-dateutil
pygments
- repeated_test
unittest2
];
diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index 23c911f8e4a6..13720f9d88bc 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -17,7 +17,8 @@
buildPythonPackage rec {
pname = "cloudsplaining";
- version = "0.4.9";
+ version = "0.4.10";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +26,7 @@ buildPythonPackage rec {
owner = "salesforce";
repo = pname;
rev = version;
- sha256 = "sha256-87ZUYHN64gnbF2g9BjPFNbwMaGFxAy3Yb8UdT3BUqC0=";
+ hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 8339af8094c4..5f262438fe95 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "cmd2";
- version = "2.3.2";
+ version = "2.3.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "cad18787a26147dad4b161d75c5ab7de16ffe91fef1cfad8e6f18b712746e800";
+ sha256 = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix
new file mode 100644
index 000000000000..2c7aeb4ceaeb
--- /dev/null
+++ b/pkgs/development/python-modules/co2signal/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "co2signal";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "CO2Signal";
+ hash = "sha256-8YdYbknLICRrZloGUZuscv5e1LIDZBcCPKZs6EMaNuo=";
+ };
+
+ propagatedBuildInputs = [ requests ];
+ # Modules has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "CO2Signal" ];
+
+ meta = with lib; {
+ description = "A package to access the CO2 Signal API ";
+ homepage = "https://github.com/danielsjf/CO2Signal";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ plabadens ];
+ };
+}
diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix
index a0c4767fe7de..02b9d7184906 100644
--- a/pkgs/development/python-modules/cocotb-bus/default.nix
+++ b/pkgs/development/python-modules/cocotb-bus/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "cocotb-bus";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3afe3abe73464269247263e44f39d59c1258f227298be4118377a8e8c09d7dc1";
+ sha256 = "a197aa4b0e0ad28469c8877b41b3fb2ec0206da9f491b9276d1578ce6dd8aa8d";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 90616dc1f8ab..7cf357cc4c65 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -5,14 +5,14 @@
, setuptools
, setuptools-scm
, cocotb-bus
-, pytest
+, pytestCheckHook
, swig
, verilog
}:
buildPythonPackage rec {
pname = "cocotb";
- version = "1.6.0";
+ version = "1.6.1";
# - we need to use the tarball from PyPi
# or the full git checkout (with .git)
@@ -20,7 +20,7 @@ buildPythonPackage rec {
# because it does not include required metadata
src = fetchPypi {
inherit pname version;
- sha256 = "a695544ab314e6d795b72ece9e67b51c6668c569b21303158e00452db43c5756";
+ sha256 = "b644a15ea1e62c55041176468976541cba30a8a5e99a5e9a2c07ee595c2b4e95";
};
nativeBuildInputs = [ setuptools-scm ];
@@ -42,11 +42,10 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
'';
- checkInputs = [ cocotb-bus pytest swig verilog ];
+ checkInputs = [ cocotb-bus pytestCheckHook swig verilog ];
checkPhase = ''
export PATH=$out/bin:$PATH
- make test
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 142245221312..7a2416728c8e 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -8,6 +8,7 @@
, intbitset
, pytest-xdist
, pytestCheckHook
+, pythonAtLeast
, pythonOlder
, requests
, saneyaml
@@ -19,6 +20,7 @@
buildPythonPackage rec {
pname = "commoncode";
version = "30.0.0";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -49,12 +51,18 @@ buildPythonPackage rec {
pytestCheckHook
pytest-xdist
];
+
disabledTests = lib.optionals stdenv.isDarwin [
# expected result is tailored towards the quirks of upstream's
# CI environment on darwin
"test_searchable_paths"
];
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/nexB/commoncode/issues/36
+ "src/commoncode/fetch.py"
+ ];
+
pythonImportsCheck = [
"commoncode"
];
diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix
deleted file mode 100644
index 0f3b6e0b4912..000000000000
--- a/pkgs/development/python-modules/configparser/4.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }:
-
-buildPythonPackage rec {
- pname = "configparser";
- version = "4.0.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df";
- };
-
- # No tests available
- doCheck = false;
-
- nativeBuildInputs = [ setuptools-scm ];
-
- preConfigure = ''
- export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
- '';
-
- meta = with lib; {
- description = "Updated configparser from Python 3.7 for Python 2.6+.";
- license = licenses.mit;
- homepage = "https://github.com/jaraco/configparser";
- };
-}
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 5f227fa4f9ef..9467003e9dd9 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "configparser";
- version = "5.1.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "202b9679a809b703720afa2eacaad4c6c2d63196070e5d9edc953c0489dfd536";
+ sha256 = "1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa";
};
# No tests available
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index d9e7ee937284..0143ffd1aa30 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }:
buildPythonPackage rec {
- version = "1.7.0";
+ version = "1.8.2";
pname = "confluent-kafka";
src = fetchPypi {
inherit pname version;
- sha256 = "80e01b4791513c27eded8517af847530dfdf04c43d99ff132ed9c3085933b75b";
+ sha256 = "b79e836c3554bc51c6837a8a0152f7521c9bf31342f5b8e21eba6b28044fa585";
};
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index ed6f2da5142f..bfe4fc221445 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -7,7 +7,6 @@
, clickclick
, decorator
, fetchFromGitHub
-, fetchpatch
, flask
, inflection
, jsonschema
@@ -23,14 +22,16 @@
buildPythonPackage rec {
pname = "connexion";
- version = "2.9.0";
+ version = "2.10.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = version;
- sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik";
+ sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8=";
};
propagatedBuildInputs = [
@@ -55,16 +56,20 @@ buildPythonPackage rec {
testfixtures
];
- patches = [
- # No minor release for later versions, https://github.com/zalando/connexion/pull/1402
- (fetchpatch {
- name = "allow-later-flask-and-werkzeug-releases.patch";
- url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch";
- sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k";
- })
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \
+ --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1"
+ '';
+
+ disabledTests = [
+ # We have a later PyYAML release
+ "test_swagger_yaml"
];
- pythonImportsCheck = [ "connexion" ];
+ pythonImportsCheck = [
+ "connexion"
+ ];
meta = with lib; {
description = "Swagger/OpenAPI First framework on top of Flask";
diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix
index 7722226ef3f1..a31930bd0c4b 100644
--- a/pkgs/development/python-modules/consonance/default.nix
+++ b/pkgs/development/python-modules/consonance/default.nix
@@ -1,29 +1,51 @@
-{ buildPythonPackage, lib, fetchFromGitHub, dissononce, python-axolotl-curve25519
-, transitions, protobuf, nose
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, dissononce
+, python-axolotl-curve25519
+, transitions
+, protobuf
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "consonance";
- version = "0.1.3";
+ version = "0.1.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tgalal";
repo = "consonance";
rev = version;
- sha256 = "1ifs0fq6i41rdna1kszv5sf87qbqx1mn98ffyx4xhw4i9r2grrjv";
+ hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
};
- checkInputs = [ nose ];
- checkPhase = ''
- # skipping online test as it requires network with uplink
- nosetests tests/test_handshakes_offline.py
- '';
+ propagatedBuildInputs = [
+ dissononce
+ python-axolotl-curve25519
+ transitions
+ protobuf
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "tests/test_handshakes_offline.py"
+ ];
- propagatedBuildInputs = [ dissononce python-axolotl-curve25519 transitions protobuf ];
+ pythonImportsCheck = [
+ "consonance"
+ ];
meta = with lib; {
- homepage = "https://pypi.org/project/consonance/";
- license = licenses.gpl3;
description = "WhatsApp's handshake implementation using Noise Protocol";
+ homepage = "https://github.com/tgalal/consonance";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/construct/2.10.54.nix b/pkgs/development/python-modules/construct/2.10.54.nix
deleted file mode 100644
index 6cfca7260512..000000000000
--- a/pkgs/development/python-modules/construct/2.10.54.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
-, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml
-}:
-
-buildPythonPackage rec {
- pname = "construct";
- version = "2.10.54";
-
- # no tests in PyPI tarball
- src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48";
- };
-
- checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy ];
-
- # these have dependencies that are broken on Python 2
- disabledTestPaths = [
- "tests/gallery/test_gallery.py"
- "tests/test_benchmarks.py"
- "tests/test_compiler.py"
- ];
-
- disabledTests = [
- "test_timestamp"
- ] ++ lib.optionals stdenv.isDarwin [
- "test_multiprocessing"
- ];
-
- pytestFlagsArray = [ "--benchmark-disable" ];
-
- meta = with lib; {
- description = "Powerful declarative parser (and builder) for binary data";
- homepage = "https://construct.readthedocs.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index b2783fa09346..8ae44476eff4 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -22,11 +22,9 @@ buildPythonPackage rec {
lz4
];
- checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel-yaml cloudpickle ];
+ checkInputs = [ pytestCheckHook numpy arrow ruamel-yaml cloudpickle ];
- disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
-
- pytestFlagsArray = [ "--benchmark-disable" ];
+ disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
meta = with lib; {
description = "Powerful declarative parser (and builder) for binary data";
diff --git a/pkgs/development/python-modules/contextlib2/0.nix b/pkgs/development/python-modules/contextlib2/0.nix
deleted file mode 100644
index 38d9fb696e28..000000000000
--- a/pkgs/development/python-modules/contextlib2/0.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, unittest2
-}:
-
-buildPythonPackage rec {
- pname = "contextlib2";
- version = "0.6.0.post1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e";
- };
-
- checkInputs = [ unittest2 ];
-
- meta = {
- description = "Backports and enhancements for the contextlib module";
- homepage = "https://contextlib2.readthedocs.org/";
- license = lib.licenses.psfl;
- };
-}
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix
index 1387e786e7b7..6aea2570cb87 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -1,23 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
-, unittest2
+, python
+, pythonOlder
}:
buildPythonPackage rec {
pname = "contextlib2";
version = "21.6.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869";
+ hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk=";
};
- checkInputs = [ unittest2 ];
+ checkPhase = ''
+ runHook preCheck
+ ${python.interpreter} -m unittest discover
+ runHook postCheck
+ '';
+
+ pythonImportsCheck = [
+ "contextlib2"
+ ];
- meta = {
+ meta = with lib; {
description = "Backports and enhancements for the contextlib module";
homepage = "https://contextlib2.readthedocs.org/";
- license = lib.licenses.psfl;
+ license = licenses.psfl;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 793db7d5e4e4..9062ad22fd83 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "cornice";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "532485ed53cae81ef476aaf4cc7c2e0208749ad1959119c46efefdeea5546eba";
+ sha256 = "6edf6f206ff1c3d108d7a7b9ae640a2f4737cfc04f0914ccc4eefe511d3a8985";
};
propagatedBuildInputs = [ pyramid simplejson six venusian ];
diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index 607057b73f21..20ccfd6e0a90 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -1,27 +1,57 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
-, colorlog, pyvmomi, requests, verboselogs
-, psutil, pyopenssl, setuptools
-, mock, pytest-mock, pytestCheckHook, qemu
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, colorlog
+, pyvmomi
+, requests
+, verboselogs
+, pyopenssl
+, setuptools
+, mock
+, pytest-mock
+, pytestCheckHook
+, qemu
}:
buildPythonPackage rec {
pname = "cot";
version = "2.2.1";
- disabled = !isPy3k;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635";
+ hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU=";
};
- propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ]
- ++ lib.optional (pythonOlder "3.3") psutil;
+ propagatedBuildInputs = [
+ colorlog
+ pyvmomi
+ requests
+ verboselogs
+ pyopenssl
+ setuptools
+ ];
- checkInputs = [ mock pytestCheckHook pytest-mock qemu ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytest-mock
+ qemu
+ ];
+
+ prePatch = ''
+ # argparse is part of the standardlib
+ substituteInPlace setup.py \
+ --replace "'argparse'," ""
+ '';
- # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)
- # try enabling these tests with ovftool once/if it is added to nixpkgs
disabledTests = [
+ # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)
+ # try enabling these tests with ovftool once/if it is added to nixpkgs
"HelperGenericTest"
"TestCOTAddDisk"
"TestCOTAddFile"
@@ -34,14 +64,15 @@ buildPythonPackage rec {
"TestQCOW2"
"TestRAW"
"TestVMDKConversion"
+ # CLI test fails with AssertionError
+ "test_help"
] ++ lib.optionals stdenv.isDarwin [
"test_serial_fixup_invalid_host"
];
- # argparse is part of the standardlib
- prePatch = ''
- substituteInPlace setup.py --replace "'argparse'," ""
- '';
+ pythonImportsCheck = [
+ "COT"
+ ];
meta = with lib; {
description = "Common OVF Tool";
diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix
deleted file mode 100644
index f7e0af082667..000000000000
--- a/pkgs/development/python-modules/cozy/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ buildPythonPackage
-, isPy3k
-, fetchFromGitHub
-, lib
-, z3
-, ply
-, igraph
-, oset
-, ordered-set
-, dictionaries
-, setuptools
-}:
-
-buildPythonPackage {
- pname = "cozy";
- version = "2.0a1";
- disabled = !isPy3k;
-
- propagatedBuildInputs = [
- setuptools
- z3
- ply
- igraph
- oset
- ordered-set
- dictionaries
- ];
-
- src = fetchFromGitHub {
- owner = "CozySynthesizer";
- repo = "cozy";
- rev = "f553e9b";
- sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j";
- };
-
- # - yoink the Z3 dependency name, because our Z3 package doesn't provide it.
- # - remove "dictionaries" version bound
- # - patch igraph package name
- postPatch = ''
- sed -i -e '/z3-solver/d' \
- -e 's/^dictionaries.*$/dictionaries/' \
- -e 's/python-igraph/igraph/' \
- requirements.txt
- '';
-
- # Tests are not correctly set up in the source tree.
- doCheck = false;
- pythonImportsCheck = [ "cozy" ];
-
- # There is some first-time-run codegen that we will force to happen.
- postInstall = ''
- $out/bin/cozy --help
- '';
-
-
- meta = with lib; {
- description = "The collection synthesizer";
- homepage = "https://cozy.uwplse.org/";
- license = licenses.asl20;
- maintainers = with maintainers; [ MostAwesomeDude ];
- };
-}
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 3628609259c1..d73ee597adc5 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "croniter";
- version = "1.0.15";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06c2smrjskd9di8lcpymcxmygncxr14932qjhslc37yyaafzq3d7";
+ sha256 = "4023e4d18ced979332369964351e8f4f608c1f7c763e146b1d740002c4245247";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cryptography/3.3.nix b/pkgs/development/python-modules/cryptography/3.3.nix
deleted file mode 100644
index 357bb35dacf7..000000000000
--- a/pkgs/development/python-modules/cryptography/3.3.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, ipaddress
-, openssl
-, cryptography_vectors
-, darwin
-, packaging
-, six
-, isPyPy
-, cffi
-, pytest
-, pretend
-, iso8601
-, pytz
-, hypothesis
-, enum34
-}:
-
-buildPythonPackage rec {
- pname = "cryptography";
- version = "3.3.2"; # Also update the hash in vectors-3.3.nix
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s";
- };
-
- patches = [ ./cryptography-py27-warning.patch ];
-
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = lib.optionals (!isPyPy) [
- cffi
- ];
-
- buildInputs = [ openssl ]
- ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
- propagatedBuildInputs = [
- packaging
- six
- ] ++ lib.optionals (!isPyPy) [
- cffi
- ] ++ lib.optionals isPy27 [
- ipaddress enum34
- ];
-
- checkInputs = [
- cryptography_vectors
- hypothesis
- iso8601
- pretend
- pytest
- pytz
- ];
-
- checkPhase = ''
- py.test --disable-pytest-warnings tests
- '';
-
- # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
- # can do until nix 1.11's release
- __impureHostDeps = [ "/usr/lib" ];
-
- meta = with lib; {
- description = "A package which provides cryptographic recipes and primitives";
- longDescription = ''
- Cryptography includes both high level recipes and low level interfaces to
- common cryptographic algorithms such as symmetric ciphers, message
- digests, and key derivation functions.
- Our goal is for it to be your "cryptographic standard library". It
- supports Python 2.7, Python 3.5+, and PyPy 5.4+.
- '';
- homepage = "https://github.com/pyca/cryptography";
- changelog = "https://cryptography.io/en/latest/changelog/#v"
- + replaceStrings [ "." ] [ "-" ] version;
- license = with licenses; [ asl20 bsd3 psfl ];
- maintainers = with maintainers; [ primeos ];
- };
-}
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index d21e6d060fe1..b4a79137d59b 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -21,18 +21,18 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "3.4.8"; # Also update the hash in vectors.nix
+ version = "36.0.0"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
- sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l";
+ sha256 = "0zshc1jaavykdnic5ns8zax6gqganys6gp5f35bqcfggnkn6kxsj";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
- sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m";
+ sha256 = "1nbw4cfshyc125jwdivg9gxy52qcd1iz31lypl95ij9bn1dyx933";
};
cargoRoot = "src/rust";
diff --git a/pkgs/development/python-modules/cryptography/vectors-3.3.nix b/pkgs/development/python-modules/cryptography/vectors-3.3.nix
deleted file mode 100644
index f9b7c525237a..000000000000
--- a/pkgs/development/python-modules/cryptography/vectors-3.3.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ buildPythonPackage, fetchPypi, lib, cryptography }:
-
-buildPythonPackage rec {
- pname = "cryptography_vectors";
- # The test vectors must have the same version as the cryptography package:
- version = cryptography.version;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc";
- };
-
- # No tests included
- doCheck = false;
-
- meta = with lib; {
- description = "Test vectors for the cryptography package";
- homepage = "https://cryptography.io/en/latest/development/test-vectors/";
- # Source: https://github.com/pyca/cryptography/tree/master/vectors;
- license = with licenses; [ asl20 bsd3 ];
- maintainers = with maintainers; [ primeos ];
- };
-}
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 7602582f8306..577c2c870910 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c";
+ sha256 = "19gs051jbsixxwhlfs4xdxpzg8w1vypzpz3w56bp9x01qwzfbdy6";
};
# No tests included
diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix
index 7791c2b9a237..c4d3b101c87d 100644
--- a/pkgs/development/python-modules/css-parser/default.nix
+++ b/pkgs/development/python-modules/css-parser/default.nix
@@ -1,18 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
buildPythonPackage rec {
pname = "css-parser";
- version = "1.0.6";
+ version = "1.0.7";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
+ sha256 = "25e096c63262dd249010ce36dab4cacd9595783ee09b5ed699ef12ab864ebbd1";
};
# Test suite not included in tarball yet
# See https://github.com/ebook-utils/css-parser/pull/2
doCheck = false;
+ pythonImportsCheck = [
+ "css_parser"
+ ];
+
meta = with lib; {
description = "A CSS Cascading Style Sheets library for Python";
homepage = "https://github.com/ebook-utils/css-parser";
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 9d1aec862508..6c1c5de2c56a 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,6 +1,8 @@
{ lib
, buildPythonPackage
+, pythonAtLeast
, pythonOlder
+, fetchpatch
, fetchPypi
, setuptools-scm
, toml
@@ -22,6 +24,14 @@ buildPythonPackage rec {
sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA=";
};
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ # fix tests for python3.10
+ (fetchpatch {
+ url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch";
+ sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ=";
+ })
+ ];
+
nativeBuildInputs = [
setuptools-scm
toml
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 6336fc0bdc01..250d337a07f6 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "cupy";
- version = "9.6.0";
+ version = "10.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91";
+ sha256 = "ad28e7311b2023391f2278b7649828decdd9d9599848e18845eb4ab1b2d01936";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 514b53b873a9..90e2608069c4 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cx_Freeze";
- version = "6.8.3";
+ version = "6.9";
src = fetchPypi {
inherit pname version;
- sha256 = "05e7a2b099d4eb36e74116311b693dcc3103763aee92ef32079be0b6d4832fa0";
+ sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b";
};
disabled = pythonOlder "3.5";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A set of scripts and modules for freezing Python scripts into executables";
- homepage = "http://cx-freeze.sourceforge.net/";
+ homepage = "https://marcelotduarte.github.io/cx_Freeze/";
license = licenses.psfl;
};
}
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 75f9c29607da..a0baa0e50f01 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -2,6 +2,8 @@
, buildPythonPackage
, fetchFromGitHub
, importlib-metadata
+, jsonschema
+, lxml
, packageurl-python
, poetry-core
, pytestCheckHook
@@ -11,12 +13,11 @@
, toml
, types-setuptools
, types-toml
-, tox
}:
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
- version = "0.12.3";
+ version = "1.1.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -25,7 +26,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "v${version}";
- sha256 = "1404wcwjglq025n8ncsrl2h64g1sly83cs9sc6jpiw1g5ay4a1vi";
+ hash = "sha256-gyqpd3kAW74ax3+ECVEmu4un2N0Xyl/aid4VrBihHxI=";
};
nativeBuildInputs = [
@@ -43,16 +44,11 @@ buildPythonPackage rec {
];
checkInputs = [
+ jsonschema
+ lxml
pytestCheckHook
- tox
];
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'setuptools = "^50.3.2"' 'setuptools = "*"' \
- --replace 'importlib-metadata = "^4.8.1"' 'importlib-metadata = "*"'
- '';
-
pythonImportsCheck = [
"cyclonedx"
];
diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix
index 67b1722be51f..ba74695fb5ea 100644
--- a/pkgs/development/python-modules/dacite/default.nix
+++ b/pkgs/development/python-modules/dacite/default.nix
@@ -2,12 +2,15 @@
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
+, pythonAtLeast
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dacite";
version = "1.6.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -21,7 +24,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "dacite" ];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/konradhalas/dacite/issues/167
+ "test_from_dict_with_union_and_wrong_data"
+ ];
+
+ pythonImportsCheck = [
+ "dacite"
+ ];
meta = with lib; {
description = "Python helper to create data classes from dictionaries";
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index a24f726e346d..c15e673fa3ed 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "datadog";
- version = "0.42.0";
+ version = "0.43.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-em+sF6fQnxiDq5pFzk/3oWqhpes8xMbN2sf4xT59Hps=";
+ sha256 = "1f2123083d9e1add6f238c62714b76ac2fc134d7d1c435cd82b976487b191b96";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix
new file mode 100644
index 000000000000..38de0218dec0
--- /dev/null
+++ b/pkgs/development/python-modules/dataset/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sqlalchemy
+, alembic
+, banal
+}:
+
+buildPythonPackage rec {
+ pname = "dataset";
+ version = "1.5.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc=";
+ };
+
+ propagatedBuildInputs = [
+ sqlalchemy alembic banal
+ ];
+
+ # checks attempt to import nonexistent module 'test.test' and fail
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "dataset"
+ ];
+
+ meta = with lib; {
+ description = "Toolkit for Python-based database access";
+ homepage = "https://dataset.readthedocs.io";
+ license = licenses.mit;
+ maintainers = [ maintainers.xfnw ];
+ };
+}
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index 23fcf511187e..599c911b9990 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -23,6 +23,10 @@ buildPythonPackage rec {
MACOSX_DEPLOYMENT_TARGET=10.16
'' else null;
+ configureFlags = [
+ "PYTHON_VERSION=${lib.versions.major python.version}"
+ ];
+
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus dbus-glib ]
# My guess why it's sometimes trying to -lncurses.
diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix
index 569e2b29631e..98f0e234e3ae 100644
--- a/pkgs/development/python-modules/debian/default.nix
+++ b/pkgs/development/python-modules/debian/default.nix
@@ -1,20 +1,22 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
, chardet
-, six
}:
buildPythonPackage rec {
pname = "python-debian";
- version = "0.1.42";
+ version = "0.1.43";
+
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a794f4c4ee2318ae7260c2e32dac252b833bdaf6686efc2a1afbc6ecf3f0931f";
+ sha256 = "abc702511c4e268da49c22fd97c83de355c559f3271e0798a6b67964be3d8248";
};
- propagatedBuildInputs = [ chardet six ];
+ propagatedBuildInputs = [ chardet ];
# No tests in archive
doCheck = false;
@@ -23,7 +25,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Debian package related modules";
+ homepage = "https://salsa.debian.org/python-debian-team/python-debian";
+ changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog";
license = licenses.gpl2;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index bf2ed3628675..dc58d8f7b039 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -13,11 +13,13 @@
, pytestCheckHook
, requests
, isPy3k
+, pythonAtLeast
}:
buildPythonPackage rec {
pname = "debugpy";
version = "1.5.1";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "Microsoft";
@@ -67,6 +69,7 @@ buildPythonPackage rec {
)'';
doCheck = isPy3k;
+
checkInputs = [
django
flask
@@ -79,9 +82,25 @@ buildPythonPackage rec {
];
# Override default arguments in pytest.ini
- pytestFlagsArray = [ "--timeout=0" "-n=$NIX_BUILD_CORES" ];
+ pytestFlagsArray = [
+ "--timeout=0"
+ "-n=$NIX_BUILD_CORES"
+ ];
- pythonImportsCheck = [ "debugpy" ];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ "test_flask_breakpoint_multiproc"
+ "test_subprocess[program-launch-None]"
+ "test_systemexit[0-zero-uncaught-raised-launch(integratedTerminal)-module]"
+ "test_systemexit[0-zero-uncaught--attach_pid-program]"
+ "test_success_exitcodes[-break_on_system_exit_zero-0-attach_listen(cli)-module]"
+ "test_success_exitcodes[--0-attach_connect(api)-program]"
+ "test_run[code-attach_connect(api)]"
+ "test_subprocess[program-launch-None]"
+ ];
+
+ pythonImportsCheck = [
+ "debugpy"
+ ];
meta = with lib; {
description = "An implementation of the Debug Adapter Protocol for Python";
diff --git a/pkgs/development/python-modules/decorator/4.nix b/pkgs/development/python-modules/decorator/4.nix
deleted file mode 100644
index 8e8fd28f0b54..000000000000
--- a/pkgs/development/python-modules/decorator/4.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "decorator";
- version = "4.4.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3";
- };
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/decorator";
- description = "Better living through Python with decorators";
- license = lib.licenses.mit;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix
index e9bbb8a63773..c12bdac5fd0b 100644
--- a/pkgs/development/python-modules/deemix/default.nix
+++ b/pkgs/development/python-modules/deemix/default.nix
@@ -12,12 +12,14 @@
buildPythonPackage rec {
pname = "deemix";
- version = "3.6.5";
+ version = "3.6.6";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "c56245b2a2142dafb0658d60919ccf34e04e5d87720d5909e0e030521349a65a";
+ sha256 = "sha256-xEahzA1PIrGPfnnOcuXQLVQpSVOUFk6/0v9ViLgWCwk=";
};
propagatedBuildInputs = [
@@ -31,18 +33,14 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
+
pythonImportsCheck = [
- "spotipy"
- "click"
- "Cryptodome"
- "mutagen"
- "requests"
"deezer"
];
meta = with lib; {
- homepage = "https://git.freezer.life/RemixDev/deemix-py";
description = "Deezer downloader built from the ashes of Deezloader Remix";
+ homepage = "https://git.freezerapp.xyz/RemixDev/deemix-py";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ natto1784 ];
};
diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix
index ae7bf52e1fe7..cdc18f159fb9 100644
--- a/pkgs/development/python-modules/deep-translator/default.nix
+++ b/pkgs/development/python-modules/deep-translator/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deep-translator";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-B/SnLSaCRVhQvSU2hmdKPswM2N73nHAzQfVNBMgCofI=";
+ sha256 = "2611c54209b234730f3e5e6481cb875e120e49d9ec1a27a1fa89850150485975";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix
index 5307fb1e6379..a05c7335214e 100644
--- a/pkgs/development/python-modules/deezer-py/default.nix
+++ b/pkgs/development/python-modules/deezer-py/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "deezer-py";
- version = "1.3.5";
+ version = "1.3.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "5bc30e8887a7dc1dfec2970d825a69c7c932564300fc84b4e68cbf59bf109baa";
+ sha256 = "a3ef151f7971d69769e7393f71373eaf896bccd22167213872ae46e04e14a2d7";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index b25440d0e0e8..9c6663d2787f 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
- version = "4.3.0";
+ version = "5.0.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
- sha256 = "17l11mhv1qkdbhmwwal3zfgr1a3w1c4bwm9lqi78gadpl5lli4i2";
+ sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 25e2692af3ba..a25ecd74b5d0 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,25 +1,34 @@
-{ lib, python, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
buildPythonPackage rec {
pname = "demjson";
version = "2.2.4";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
};
- checkPhase = lib.optionalString isPy3k ''
- ${python.interpreter} -m lib2to3 -w test/test_demjson.py
- '' + ''
+ doCheck = !(isPy3k);
+
+ checkPhase = ''
${python.interpreter} test/test_demjson.py
'';
+ pythonImportsCheck = [
+ "demjson"
+ ];
+
meta = with lib; {
description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
homepage = "https://github.com/dmeranda/demjson";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ bjornfor ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 94d3f73950f5..238295ffefbf 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -16,6 +16,8 @@
buildPythonPackage rec {
pname = "denonavr";
version = "0.10.9";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -40,7 +42,14 @@ buildPythonPackage rec {
pytest-timeout
];
- pythonImportsCheck = [ "denonavr" ];
+ disabledTestPaths = [
+ # https://github.com/ol-iver/denonavr/issues/228
+ "tests/test_denonavr.py"
+ ];
+
+ pythonImportsCheck = [
+ "denonavr"
+ ];
meta = with lib; {
description = "Automation Library for Denon AVR receivers";
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index fb5698062f77..d77554c79ab8 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -1,4 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }:
+{ lib, buildPythonPackage, fetchPypi
+, fetchpatch
+, packaging
+, python
+, pythonAtLeast
+, pythonOlder
+, unittest2
+}:
buildPythonPackage rec {
pname = "deprecation";
@@ -9,9 +16,22 @@ buildPythonPackage rec {
sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj";
};
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ # fixes for python 3.10 test suite
+ (fetchpatch {
+ url = "https://github.com/briancurtin/deprecation/pull/57/commits/e13e23068cb8d653a02a434a159e8b0b7226ffd6.patch";
+ sha256 = "sha256-/5zr2V1s5ULUZnbLXsgyHxZH4m7/a27QYuqQt2Savc8=";
+ includes = [ "tests/test_deprecation.py" ];
+ })
+ ];
+
propagatedBuildInputs = [ packaging ];
- checkInputs = [ unittest2 ];
+ # avoiding mass rebuilds for python3.9, but no longer
+ # needed with patch
+ checkInputs = lib.optional (pythonOlder "3.10") [
+ unittest2
+ ];
checkPhase = ''
${python.interpreter} -m unittest discover
diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix
index 5abe989e98d5..4fbc0f06fc43 100644
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, httpx
, protobuf
, pytest-asyncio
@@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "devolo-plc-api";
- version = "0.7.0";
+ version = "0.7.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "v${version}";
- sha256 = "sha256-qzjH52bKQ/oSFd580V92uE2/Z2g+2nLh/JXOXYqVfSY=";
+ sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -38,7 +39,6 @@ buildPythonPackage rec {
zeroconf
];
-
checkInputs = [
pytest-asyncio
pytest-httpx
@@ -46,6 +46,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+
+
pythonImportsCheck = [
"devolo_plc_api"
];
diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index 98f446315d91..5d4f0871bf78 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
disabledTests = [
# Test for Windows32
"test_print_subprocess"
+ # sensitive to timing
+ "test_multiple_not_verbose"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index e015a6522d6e..d6173494e8dc 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "diagrams";
- version = "0.20.0";
+ version = "0.21.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
- sha256 = "1lcqsy3bvlnlnakjysp8qjhy26bhkp1izi5dvzq2fpsffgxk4si4";
+ sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix
new file mode 100644
index 000000000000..5e043e55f853
--- /dev/null
+++ b/pkgs/development/python-modules/dictdiffer/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "dictdiffer";
+ version = "0.9.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "inveniosoftware";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU=";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'pytest-runner>=2.7'," ""
+ substituteInPlace pytest.ini \
+ --replace ' --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=dictdiffer --cov-report=term-missing' ""
+ '';
+
+ pythonImportsCheck = [
+ "dictdiffer"
+ ];
+
+ meta = with lib; {
+ description = "Module to diff and patch dictionaries";
+ homepage = "https://github.com/inveniosoftware/dictdiffer";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 7a9e1205979a..1751271a2221 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "diff-cover";
- version = "5.4.0";
+ version = "5.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "diff_cover";
inherit version;
- sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs=";
+ sha256 = "e2d36131c13f571d9f5c4109b9e08b71ed00757eabec0156de74e33f6ef5627f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix
index 5a2e6e60b830..89cf7d910127 100644
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/pkgs/development/python-modules/diofant/default.nix
@@ -12,13 +12,14 @@
buildPythonPackage rec {
pname = "diofant";
- version = "0.12.0";
+ version = "0.13.0";
disabled = pythonOlder "3.9";
+ format = "pyproject";
src = fetchPypi {
inherit version;
pname = "Diofant";
- sha256 = "sha256-G0CTSoDSduiWxlrk5XjnX5ldNZ9f7yxaJeUPO3ezJgo=";
+ sha256 = "bac9e086a7156b20f18e3291d6db34e305338039a3c782c585302d377b74dd3c";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index 457ab077a0ce..26cb0e438f01 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -1,50 +1,62 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
-, pytest-cov
-, pytest-xdist
, pytest-django
-, mock
+, pytest-xdist
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "diskcache";
- version = "5.2.1";
+ version = "5.4.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "grantjenks";
repo = "python-diskcache";
rev = "v${version}";
- sha256 = "sha256-dWtEyyWpg0rxEwyhBdPyApzgS9o60HVGbtY76ELHvX8=";
+ hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o=";
};
checkInputs = [
- pytestCheckHook
- pytest-cov
- pytest-xdist
pytest-django
- mock
+ pytest-xdist
+ pytestCheckHook
];
- # Darwin sandbox causes most tests to fail.
+ postPatch = ''
+ sed -i "/--cov/d" tox.ini
+ '';
+
+ # Darwin sandbox causes most tests to fail
doCheck = !stdenv.isDarwin;
- pythonImportsCheck = [ "diskcache" ];
disabledTests = [
- # very time sensitive, can fail on over subscribed machines
+ # Very time sensitive, can fail on over subscribed machines
"test_incr_update_keyerror"
+ # AssertionError: 'default' is not None
+ "test_decr_version"
+ "test_incr_version"
+ "test_get_or_set"
+ "test_get_many"
];
pytestFlagsArray = [
"-n $NIX_BUILD_CORES"
];
+ pythonImportsCheck = [
+ "diskcache"
+ ];
+
meta = with lib; {
description = "Disk and file backed persistent cache";
homepage = "http://www.grantjenks.com/docs/diskcache/";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
index ee2d8e2f21e8..c8d427900c68 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "1.0.2";
+ version = "1.0.4";
pname = "dj-email-url";
src = fetchPypi {
inherit pname version;
- sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7";
+ sha256 = "7ee35df51065d17ac7b55e98ad8eda3a1f6c5d65fc89cdc5de7a96e534942553";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index 06dd78989fe0..86134f9d1789 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "django-anymail";
- version = "8.4";
+ version = "8.5";
src = fetchFromGitHub {
owner = "anymail";
repo = pname;
rev = "v${version}";
- sha256 = "08ac24hrafkk1jg3milfjky3qni1cz5qggp1rgzq9r7ina4akjma";
+ sha256 = "1p2c7hf9baxr8khk8h7y8d38imw4zm920dgd9nbda18vlh7gpbcf";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index 68451cc8d8db..f67ea344be92 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "django-debug-toolbar";
- version = "3.2.2";
+ version = "3.2.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = version;
- sha256 = "1dgb3s449nasbnqd5xfikxrfhwwilwlgrw9nv4bfkapvkzpdszjk";
+ sha256 = "1008yzxxs1cp1wc0xcc9xskc3f7naxc4srv1sikiank1bc3479ha";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 541f0434ec00..c4b023886935 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -1,59 +1,54 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, django
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, django
, factory_boy
-, glibcLocales
, mock
, pygments
-, pytest
-, pytest-cov
, pytest-django
-, python-dateutil
+, pytestCheckHook
, shortuuid
-, six
-, tox
-, typing ? null
, vobject
, werkzeug
}:
buildPythonPackage rec {
pname = "django-extensions";
- version = "3.1.3";
+ version = "3.1.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "03mhikhh49z8bxajbjf1j790b9c9vl4zf4f86iwz7g0zrd7jqlvm";
+ sha256 = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";
};
- LC_ALL = "en_US.UTF-8";
- __darwinAllowLocalNetworking = true;
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "--cov=django_extensions --cov-report html --cov-report term" ""
+ '';
- propagatedBuildInputs = [ six ]
- ++ lib.optional (pythonOlder "3.5") typing;
+ propagatedBuildInputs = [
+ django
+ ];
+
+ __darwinAllowLocalNetworking = true;
checkInputs = [
- django
factory_boy
- glibcLocales
mock
pygments # not explicitly declared in setup.py, but some tests require it
- pytest
- pytest-cov
pytest-django
- python-dateutil
+ pytestCheckHook
shortuuid
- tox
vobject
werkzeug
];
- # remove tests that need network access
- checkPhase = ''
- rm tests/management/commands/test_pipchecker.py
- DJANGO_SETTINGS_MODULE=tests.testapp.settings \
- pytest django_extensions tests
- '';
+ disabledTestPaths = [
+ # requires network access
+ "tests/management/commands/test_pipchecker.py"
+ ];
meta = with lib; {
description = "A collection of custom extensions for the Django Framework";
diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix
index b4d90da08808..86bcc85eb0ae 100644
--- a/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "django-maintenance-mode";
- version = "0.14.0";
+ version = "0.16.2";
src = fetchFromGitHub {
owner = "fabiocaccamo";
repo = pname;
rev = version;
- sha256 = "1k06fhqd8wyrkp795x5j2r328l2phqgg1m1qm7fh4l2qrha43aw6";
+ sha256 = "0krcq04pf4g50q88l7q1wc53jgkhjmvif3acghfqq8c3s2y7mbz7";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 6212c754f893..e2c5f5e874a5 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "django-oauth-toolkit";
- version = "1.6.1";
+ version = "1.6.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = version;
- sha256 = "sha256-TOrFxQULwiuwpVFqRwRkfTW+GRudLNy6F/gIjUYjZhI=";
+ sha256 = "00vmnsj1xdaddxqkdp9zvnm255mblljldp90a0wjsh257d8nyvyh";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix
index 7f7cfd2b4bcb..61541bbe25a1 100644
--- a/pkgs/development/python-modules/django-taggit/default.nix
+++ b/pkgs/development/python-modules/django-taggit/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "django-taggit";
- version = "1.5.1";
+ version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a";
+ sha256 = "a23ca776ee2709b455c3a95625be1e4b891ddf1ffb4173153c41806de4038d72";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
index c1e5139d3015..9a0d98034c66 100644
--- a/pkgs/development/python-modules/django/2.nix
+++ b/pkgs/development/python-modules/django/2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.24";
+ version = "2.2.25";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1dvx3x85lggm91x7mpvaf9nmpxyz7r97pbpnmr2k1qfy0c7gyf9k";
+ sha256 = "sha256-seZerzcTR9SxPrfgYbCXhslzBh3pU5DDJ8hcHiqiNJw=";
};
patches = lib.optional withGdal
diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index 9b8aa8cba8f4..fdcb8129f27d 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "3.2.9";
+ version = "3.2.10";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08";
+ sha256 = "sha256-B06IGLS0Cs3CNp5n3NZVXVWDKXhUCNzSU0DumPHx1cQ=";
};
patches = lib.optional withGdal
diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix
index 7e0402999f03..0f4ec03f5ff3 100644
--- a/pkgs/development/python-modules/dnslib/default.nix
+++ b/pkgs/development/python-modules/dnslib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dnslib";
- version = "0.9.16";
+ version = "0.9.19";
src = fetchPypi {
inherit pname version;
- sha256 = "2d66b43d563d60c469117c8cb615843e7d05bf8fb2e6cb00a637281d26b7ec7d";
+ sha256 = "a6e36ca96c289e2cb4ac6aa05c037cbef318401ba8ff04a8676892ca79749c77";
};
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";
diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix
index 5b89c6bdb912..66e5d5d54686 100644
--- a/pkgs/development/python-modules/dogpile-cache/default.nix
+++ b/pkgs/development/python-modules/dogpile-cache/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "dogpile-cache";
- version = "1.1.4";
+ version = "1.1.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "dogpile.cache";
inherit version;
- sha256 = "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813";
+ sha256 = "0f01bdc329329a8289af9705ff40fadb1f82a28c336f3174e12142b70d31c756";
};
preCheck = ''
diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
index 4ceb8e71f648..c1d26bac0f45 100644
--- a/pkgs/development/python-modules/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "doit";
- version = "0.33.1";
+ version = "0.34.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143";
+ sha256 = "49467c1bf8850a292e5fd0254ee1b219f6fd8202a0d3d4bf33af3c2dfb58d688";
};
propagatedBuildInputs = [ cloudpickle ]
diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix
index e0c25c77e53c..9d99709c9166 100644
--- a/pkgs/development/python-modules/downloader-cli/default.nix
+++ b/pkgs/development/python-modules/downloader-cli/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "downloader-cli";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "deepjyoti30";
repo = pname;
rev = version;
- sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228";
+ sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y";
};
propagatedBuildInputs = [ urllib3 ];
diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix
index 2cf125c8df35..1b2292b46b7a 100644
--- a/pkgs/development/python-modules/drf-jwt/default.nix
+++ b/pkgs/development/python-modules/drf-jwt/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "drf-jwt";
- version = "1.19.1";
+ version = "1.19.2";
src = fetchFromGitHub {
owner = "Styria-Digital";
repo = "django-rest-framework-jwt";
rev = version;
- sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g=";
+ hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 6e47e4eb389a..787a54f26769 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -1,10 +1,10 @@
{ lib
, buildPythonPackage
, duckdb
+, mypy
, numpy
, pandas
, pybind11
-, mypy
, setuptools-scm
, pytestCheckHook
}:
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index b9a96cbc8298..006280376814 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "dufte";
- version = "0.2.27";
+ version = "0.2.29";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nschloe";
repo = pname;
rev = version;
- sha256 = "1i68h224hx9clxj3l0rd2yigsi6fqsr3x10vj5hf3j6s69iah7r3";
+ sha256 = "0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
};
format = "pyproject";
@@ -28,6 +28,13 @@ buildPythonPackage rec {
importlib-metadata
];
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ mkdir -p $HOME/.config/matplotlib
+ echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
+ ln -s $HOME/.config/matplotlib $HOME/.matplotlib
+ '';
+
checkInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 74595943a402..4a001796dd8e 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
- version = "0.20.27";
+ version = "0.20.31";
pname = "dulwich";
format = "setuptools";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-9dP6dlmRTnorh4NahWZsdwHTdR+IFVFlPUzSVgsqEk4=";
+ hash = "sha256-9vwYpVDNsU5xCjcqBflcnIMc/DEp/X7RGyASDuVwFYc=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index e896e79908b6..275d9aa6ef2c 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "easy-thumbnails";
- version = "2.8";
+ version = "2.8.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "fd2249d936671847fc54a2d6c8c87bcca8f803001967dd03bab6b8bcb7590825";
+ sha256 = "1a283fe8a3569c3feab4605e8279929d75c85c1151b2fd627f95b1863b5fc6c2";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index a2de3a70971d..18b8d671c98a 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -44,6 +44,11 @@ buildPythonPackage rec {
checkPhase = ''
export HOME=$TMPDIR
+
+ # Prevent hangs on PyTorch-related tests, see
+ # https://discuss.pytorch.org/t/pytorch-cpu-hangs-on-nn-linear/17748/4
+ export OMP_NUM_THREADS=1
+
nosetests -v -w tests
'';
diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
new file mode 100644
index 000000000000..ec968dce8ec3
--- /dev/null
+++ b/pkgs/development/python-modules/elegy/default.nix
@@ -0,0 +1,75 @@
+{ buildPythonPackage
+, cloudpickle
+, deepdish
+, deepmerge
+, dm-haiku
+, fetchFromGitHub
+, lib
+, poetry
+, pytestCheckHook
+, pytorch
+, pyyaml
+, sh
+, tables
+, tabulate
+, tensorboardx
+, tensorflow
+, toolz
+, treex
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+ pname = "elegy";
+ version = "0.8.4";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "poets-ai";
+ repo = pname;
+ rev = version;
+ sha256 = "11w8lgl31b52w2qri8j8cgzd30sn8i3769g8nkkshvgkjgca9r4g";
+ };
+
+ nativeBuildInputs = [
+ poetry
+ ];
+
+ propagatedBuildInputs = [
+ cloudpickle
+ deepdish
+ deepmerge
+ dm-haiku
+ pyyaml
+ tables
+ tabulate
+ tensorboardx
+ toolz
+ treex
+ typing-extensions
+ ];
+
+ pythonImportsCheck = [
+ "elegy"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytorch
+ sh
+ tensorflow
+ ];
+
+ disabledTests = [
+ # Fails with `Could not find compiler for platform Host: NOT_FOUND: could not find registered compiler for platform Host -- check target linkage`.
+ # Runs fine in docker with Ubuntu 22.04. I suspect the issue is the sandboxing in `nixpkgs` but not sure.
+ "test_saved_model_poly"
+ ];
+
+ meta = with lib; {
+ description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
+ homepage = "https://github.com/poets-ai/elegy";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix
index d0c072901c35..2a6c10da35e7 100644
--- a/pkgs/development/python-modules/elgato/default.nix
+++ b/pkgs/development/python-modules/elgato/default.nix
@@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "elgato";
- version = "2.2.0";
+ version = "3.0.0";
format = "pyproject";
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-elgato";
rev = "v${version}";
- sha256 = "sha256-xsIglJSnvtd3NKqwoRAonPRN+C9KWyar0mrYcC3hPpw=";
+ sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix
index d688e1e22e66..62dcc44ca593 100644
--- a/pkgs/development/python-modules/emv/default.nix
+++ b/pkgs/development/python-modules/emv/default.nix
@@ -39,7 +39,8 @@ buildPythonPackage rec {
--replace '"enum-compat==0.0.3",' "" \
--replace '"argparse==1.4.0",' "" \
--replace "click==7.1.2" "click" \
- --replace "pyscard==2.0.0" "pyscard"
+ --replace "pyscard==2.0.0" "pyscard" \
+ --replace "terminaltables==3.1.0" "terminaltables"
'';
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index 8257af2e45fe..cc1623177346 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "enaml";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "nucleic";
repo = pname;
rev = version;
- sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI=";
+ sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw=";
};
# qt bindings cannot be found during tests
diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix
index 21cc4512386f..46d5ee725c75 100644
--- a/pkgs/development/python-modules/enamlx/default.nix
+++ b/pkgs/development/python-modules/enamlx/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "enamlx";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "frmdstryr";
repo = pname;
rev = "v${version}";
- sha256 = "1fwfh5h1l68zwkjayf71dmxrhjbscsh87p4mskzkwwaj5cxsva90";
+ sha256 = "10sn7wd4fjz8nkzprd8wa5da5dg8w91r0rngqaipwnpq1dz54b5s";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix
index 2b81577af22d..fbd22a42b555 100644
--- a/pkgs/development/python-modules/enrich/default.nix
+++ b/pkgs/development/python-modules/enrich/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "enrich";
- version = "1.2.6";
+ version = "1.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Dpn/V9h/e13vDKeZF+iPuTUaoNUuIo7ji/982FgxX+Q=";
+ sha256 = "0a2ab0d2931dff8947012602d1234d2a3ee002d9a355b5d70be6bf5466008893";
};
buildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix
index 07363a379b1f..b114c794ae3f 100644
--- a/pkgs/development/python-modules/enturclient/default.nix
+++ b/pkgs/development/python-modules/enturclient/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "enturclient";
- version = "0.2.2";
+ version = "0.2.3";
disabled = pythonOlder "3.8";
format = "pyproject";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "hfurubotten";
repo = pname;
rev = "v${version}";
- sha256 = "1kl44ch8p31pr70yv6na2m0w40frackdwzph9rpb05sc83va701i";
+ sha256 = "1w0791f4p3yyncc1izx3q97fyaky2ling14qr0yn0acrmq9yh5cc";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix
deleted file mode 100644
index db827601d5de..000000000000
--- a/pkgs/development/python-modules/enum/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, isPyPy
-}:
-
-buildPythonPackage rec {
- pname = "enum";
- version = "0.4.7";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "001iq0yqs9f5bslvl793bhkcs71k5km9kv8yrj5h0lfsgrcg6z4c";
- };
-
- doCheck = !isPyPy;
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/enum/";
- description = "Robust enumerated type support in Python";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix
index b8513fd1d9ae..f40ab66baabd 100644
--- a/pkgs/development/python-modules/envisage/default.nix
+++ b/pkgs/development/python-modules/envisage/default.nix
@@ -1,19 +1,21 @@
{ lib
-, fetchPypi
-, isPy27
-, buildPythonPackage
-, traits
, apptools
-, pytestCheckHook
+, buildPythonPackage
+, fetchPypi
, ipython
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
, setuptools
+, traits
}:
buildPythonPackage rec {
pname = "envisage";
version = "6.0.1";
+ format = "setuptools";
- disabled = isPy27;
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -22,7 +24,11 @@ buildPythonPackage rec {
# for the optional dependency ipykernel, only versions < 6 are
# supported, so it's not included in the tests, and not propagated
- propagatedBuildInputs = [ traits apptools setuptools ];
+ propagatedBuildInputs = [
+ traits
+ apptools
+ setuptools
+ ];
preCheck = ''
export HOME=$PWD/HOME
@@ -33,10 +39,20 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/enthought/envisage/issues/455
+ "envisage/tests/test_egg_basket_plugin_manager.py"
+ "envisage/tests/test_egg_plugin_manager.py"
+ ];
+
+ pythonImportsCheck = [
+ "envisage"
+ ];
+
meta = with lib; {
- description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'";
+ description = "Framework for building applications whose functionalities can be extended by adding plug-ins";
homepage = "https://github.com/enthought/envisage";
- maintainers = with lib.maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
+ maintainers = with lib.maintainers; [ knedlsepp ];
};
}
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 038b66a8efed..7c8f520647ee 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, pythonOlder
, dnspython
, greenlet
@@ -10,22 +10,35 @@
, nose
, pyopenssl
, iana-etc
+, pytestCheckHook
, libredirect
}:
buildPythonPackage rec {
pname = "eventlet";
version = "0.33.0";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f";
+ src = fetchFromGitHub {
+ owner = "eventlet";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-kE/eYBbaTt1mPGoUIMhonvFBlQOdAfPU5GvCvPaRHvs=";
};
- propagatedBuildInputs = [ dnspython greenlet pyopenssl six ]
- ++ lib.optional (pythonOlder "3.5") monotonic;
+ propagatedBuildInputs = [
+ dnspython
+ greenlet
+ pyopenssl
+ six
+ ] ++ lib.optional (pythonOlder "3.5") [
+ monotonic
+ ];
- checkInputs = [ nose ];
+ checkInputs = [
+ pytestCheckHook
+ nose
+ ];
doCheck = !stdenv.isDarwin;
@@ -37,23 +50,48 @@ buildPythonPackage rec {
export EVENTLET_IMPORT_VERSION_ONLY=0
'';
- checkPhase = ''
- runHook preCheck
+ disabledTests = [
+ # Tests requires network access
+ "test_017_ssl_zeroreturnerror"
+ "test_getaddrinfo"
+ "test_hosts_no_network"
+ "test_leakage_from_tracebacks"
+ "test_patcher_existing_locks_locked"
+ ];
- # test_fork-after_monkey_patch fails on aarch64 on hydra only
- # AssertionError: Expected single line "pass" in stdout
- nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network --exclude test_fork_after_monkey_patch
-
- runHook postCheck
- '';
+ disabledTestPaths = [
+ # Tests are out-dated
+ "tests/stdlib/test_asynchat.py"
+ "tests/stdlib/test_asyncore.py"
+ "tests/stdlib/test_ftplib.py"
+ "tests/stdlib/test_httplib.py"
+ "tests/stdlib/test_httpservers.py"
+ "tests/stdlib/test_os.py"
+ "tests/stdlib/test_queue.py"
+ "tests/stdlib/test_select.py"
+ "tests/stdlib/test_SimpleHTTPServer.py"
+ "tests/stdlib/test_socket_ssl.py"
+ "tests/stdlib/test_socket.py"
+ "tests/stdlib/test_socketserver.py"
+ "tests/stdlib/test_ssl.py"
+ "tests/stdlib/test_subprocess.py"
+ "tests/stdlib/test_thread__boundedsem.py"
+ "tests/stdlib/test_thread.py"
+ "tests/stdlib/test_threading_local.py"
+ "tests/stdlib/test_threading.py"
+ "tests/stdlib/test_timeout.py"
+ "tests/stdlib/test_urllib.py"
+ "tests/stdlib/test_urllib2_localnet.py"
+ "tests/stdlib/test_urllib2.py"
+ ];
# unfortunately, it needs /etc/protocol to be present to not fail
# pythonImportsCheck = [ "eventlet" ];
meta = with lib; {
- homepage = "https://github.com/eventlet/eventlet/";
description = "A concurrent networking library for Python";
- maintainers = with maintainers; [ SuperSandro2000 ];
+ homepage = "https://github.com/eventlet/eventlet/";
license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index 6ab7495fcb30..154742638b05 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -1,5 +1,4 @@
{ lib
-, backports-datetime-fromisoformat
, backports-zoneinfo
, buildPythonPackage
, cached-property
@@ -27,16 +26,16 @@
buildPythonPackage rec {
pname = "exchangelib";
- version = "4.6.2";
+ version = "4.7.1";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
- sha256 = "1vax4xqjav6nr3kfkz390ism3cs69dxnbx6sc0f9ci4mn3rxjwdy";
+ sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860";
};
propagatedBuildInputs = [
@@ -55,8 +54,6 @@ buildPythonPackage rec {
tzlocal
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
- ] ++ lib.optionals (pythonOlder "3.7") [
- backports-datetime-fromisoformat
];
checkInputs = [
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index f363b6bb6f66..28caec986dcc 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "faker";
- version = "9.3.1";
+ version = "9.9.0";
src = fetchPypi {
pname = "Faker";
inherit version;
- hash = "sha256-zdnpry+6XJbuLsSshBm7pFjia1iiuYwfZGfuZglr7lI=";
+ hash = "sha256-cidwOj2zbtgkEQhUdUREX0WqRdsvP2PohcubVpk4Pw4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
index ebef907f91f5..ca0969b95178 100644
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "faraday-plugins";
- version = "1.5.9";
+ version = "1.5.10";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_plugins";
rev = "v${version}";
- sha256 = "sha256-rU7BF1lXLgJYLed5FVKXroivxKpmmNE5woGCpAcKAwg=";
+ sha256 = "sha256-Xj1Ibl+xDN3uCww54StUBCc+w/iPMdbWucRqdb+GHVI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index f0f10a88c7dd..53fab7e31419 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi";
- version = "0.70.1";
+ version = "0.71.0";
format = "flit";
disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "tiangolo";
repo = pname;
rev = version;
- sha256 = "sha256-iwjxcAe8h38PPTTDGCxIJSB7zCS0FA0gOcKUjPpk3yg=";
+ sha256 = "sha256-J4j7lQm22pbwfMkQGF1s2xyFU4MCwXrAqDmRJmLmKGg=";
};
propagatedBuildInputs = [
@@ -64,6 +64,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# Disabled tests require orjson which requires rust nightly
"tests/test_default_response_class.py"
+ # Don't test docs and examples
+ "docs_src"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 0bc1246eb326..935eefa5182f 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
- version = "1.4.4";
+ version = "1.4.9";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1sf8nqifwp0cggk59s22ygj3rm1nysa8b91xl8bpv2knqyjy1q32";
+ sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0";
};
preBuild = ''
diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix
index 6a6cc6ea8046..415f226b783c 100644
--- a/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -1,14 +1,15 @@
{ lib
, buildPythonPackage
-, pythonOlder
, fetchFromGitHub
- # Check inputs
+, fetchpatch
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "fastjsonschema";
- version = "2.15.1";
+ version = "2.15.2";
+ format = "setuptools";
disabled = pythonOlder "3.3";
@@ -17,11 +18,25 @@ buildPythonPackage rec {
repo = "python-fastjsonschema";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ=";
+ hash = "sha256-zrdQVFfLZxZRr9qvss4CI3LJK97xl+bY+AcPzcweYeU=";
};
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
dontUseSetuptoolsCheck = true;
+
+ patches = [
+ # Can be removed with the next release, https://github.com/horejsek/python-fastjsonschema/pull/134
+ (fetchpatch {
+ name = "fix-exception-name.patch";
+ url = "https://github.com/horejsek/python-fastjsonschema/commit/f639dcba0299926d688e1d8d08a6a91bfe70ce8b.patch";
+ sha256 = "sha256-yPV5ZNeyAobLrYf5QHanPsEomBPJ/7ZN2148R8NO4/U=";
+ })
+ ];
+
+
disabledTests = [
"benchmark"
# these tests require network access
@@ -29,10 +44,12 @@ buildPythonPackage rec {
"definitions"
];
- pythonImportsCheck = [ "fastjsonschema" ];
+ pythonImportsCheck = [
+ "fastjsonschema"
+ ];
meta = with lib; {
- description = "Fast JSON schema validator for Python.";
+ description = "JSON schema validator for Python";
homepage = "https://horejsek.github.io/python-fastjsonschema/";
license = licenses.bsd3;
maintainers = with maintainers; [ drewrisinger ];
diff --git a/pkgs/development/python-modules/file-read-backwards/default.nix b/pkgs/development/python-modules/file-read-backwards/default.nix
new file mode 100644
index 000000000000..80150a60de91
--- /dev/null
+++ b/pkgs/development/python-modules/file-read-backwards/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, mock }:
+
+buildPythonPackage rec {
+ pname = "file-read-backwards";
+ version = "2.0.0";
+
+ src = fetchPypi {
+ pname = "file_read_backwards";
+ inherit version;
+ sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8";
+ };
+
+ checkInputs = [ mock ];
+ pythonImportsCheck = [ "file_read_backwards" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/RobinNil/file_read_backwards";
+ description = "Memory efficient way of reading files line-by-line from the end of file";
+ license = licenses.mit;
+ maintainers = with maintainers; [ j0hax ];
+ };
+}
diff --git a/pkgs/development/python-modules/filelock/3.2.nix b/pkgs/development/python-modules/filelock/3.2.nix
deleted file mode 100644
index 401fdf582ffb..000000000000
--- a/pkgs/development/python-modules/filelock/3.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm }:
-
-buildPythonPackage rec {
- pname = "filelock";
- version = "3.2.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw";
- };
-
- nativeBuildInputs = [
- setuptools-scm
- ];
-
- meta = with lib; {
- homepage = "https://github.com/benediktschmitt/py-filelock";
- description = "A platform independent file lock for Python";
- license = licenses.unlicense;
- maintainers = with maintainers; [ henkkalkwater ];
- };
-}
diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index e802dbaa2691..3e9f9943327d 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -7,6 +7,7 @@
, testtools
, mock
, python
+, six
}:
buildPythonPackage rec {
@@ -33,6 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
testtools
+ six # not in install_requires, but used in fixture.py
];
checkInputs = [
diff --git a/pkgs/development/python-modules/flake8-docstrings/default.nix b/pkgs/development/python-modules/flake8-docstrings/default.nix
new file mode 100644
index 000000000000..a02d900a7f07
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-docstrings/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flake8
+, pydocstyle
+}:
+
+buildPythonPackage rec {
+ pname = "flake8-docstrings";
+ version = "1.6.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9fe7c6a306064af8e62a055c2f61e9eb1da55f84bb39caef2b84ce53708ac34b";
+ };
+
+ propagatedBuildInputs = [ flake8 pydocstyle ];
+
+ pythonImportsCheck = [ "flake8_docstrings" ];
+
+ meta = with lib; {
+ description = "Extension for flake8 which uses pydocstyle to check docstrings";
+ homepage = "https://gitlab.com/pycqa/flake8-docstrings";
+ license = licenses.mit;
+ maintainers = with maintainers; [ smaret ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix
new file mode 100644
index 000000000000..c0bbf7d01467
--- /dev/null
+++ b/pkgs/development/python-modules/flask-gravatar/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, pytestCheckHook
+, pygments
+}:
+
+buildPythonPackage rec {
+ pname = "flask-gravatar";
+ version = "0.5.0";
+
+ src = fetchPypi {
+ pname = "Flask-Gravatar";
+ inherit version;
+ sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE=";
+ };
+
+ postPatch = ''
+ sed -i setup.py \
+ -e "s|tests_require=tests_require,||g" \
+ -e "s|extras_require=extras_require,||g" \
+ -e "s|setup_requires=setup_requires,||g"
+ # pep8 is deprecated and cov not needed
+ substituteInPlace pytest.ini \
+ --replace "--pep8" "" \
+ --replace "--cov=flask_gravatar --cov-report=term-missing" ""
+ '';
+
+ propagatedBuildInputs = [
+ flask
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pygments
+ ];
+
+ pythonImportsCheck = [ "flask_gravatar" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/zzzsochi/Flask-Gravatar";
+ description = "Small and simple integration of gravatar into flask";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index 9d54849e92d9..3c7058c1212d 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -1,27 +1,51 @@
-{ lib, buildPythonPackage, fetchPypi, pythonAtLeast
-, flask, blinker, nose, mock, semantic-version }:
+{ lib
+, blinker
+, buildPythonPackage
+, fetchPypi
+, flask
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, semantic-version
+, werkzeug
+}:
buildPythonPackage rec {
- pname = "Flask-Login";
+ pname = "flask-login";
version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit pname version;
+ pname = "Flask-Login";
+ inherit version;
sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b";
};
- checkInputs = [ nose mock semantic-version ];
- propagatedBuildInputs = [ flask blinker ];
+ propagatedBuildInputs = [
+ flask
+ werkzeug
+ ];
+
+ checkInputs = [
+ blinker
+ pytestCheckHook
+ semantic-version
+ ];
- checkPhase = "nosetests -d";
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ "test_hashable"
+ ];
- doCheck = pythonAtLeast "3.3";
+ pythonImportsCheck = [
+ "flask_login"
+ ];
meta = with lib; {
- homepage = "https://github.com/maxcountryman/flask-login";
description = "User session management for Flask";
+ homepage = "https://github.com/maxcountryman/flask-login";
license = licenses.mit;
- platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix
new file mode 100644
index 000000000000..787b34a93b37
--- /dev/null
+++ b/pkgs/development/python-modules/flask-paranoid/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "flask-paranoid";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "miguelgrinberg";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0WWc/ktAOuTk4A75xI1jCj/aef2+1TjLKBA9+PRfJO0=";
+ };
+
+ postPatch = ''
+ # tests have a typo in one of the assertions
+ substituteInPlace tests/test_paranoid.py --replace "01-Jan-1970" "01 Jan 1970"
+ '';
+
+ propagatedBuildInputs = [
+ flask
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "flask_paranoid" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/miguelgrinberg/flask-paranoid/";
+ description = "Simple user session protection";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix
new file mode 100644
index 000000000000..ddf5aa05c493
--- /dev/null
+++ b/pkgs/development/python-modules/flask-security-too/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, blinker
+, setuptools
+, itsdangerous
+, flask_principal
+, passlib
+, email_validator
+, flask_wtf
+, flask_login
+, pytestCheckHook
+, flask_mail
+, sqlalchemy
+, flask_sqlalchemy
+, flask-mongoengine
+, peewee
+, pony
+, zxcvbn
+, mongoengine
+, cryptography
+, pyqrcode
+, phonenumbers
+, bleach
+, mongomock
+}:
+
+buildPythonPackage rec {
+ pname = "flask-security-too";
+ version = "4.1.2";
+
+ src = fetchPypi {
+ pname = "Flask-Security-Too";
+ inherit version;
+ sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ flask_login
+ flask_principal
+ flask_wtf
+ email_validator
+ itsdangerous
+ passlib
+ blinker
+ setuptools
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ flask_mail
+ sqlalchemy
+ flask_sqlalchemy
+ flask-mongoengine
+ peewee
+ pony
+ zxcvbn
+ mongoengine
+ cryptography
+ pyqrcode
+ phonenumbers
+ bleach
+ mongomock
+ ];
+
+ pythonImportsCheck = [ "flask_security" ];
+
+ meta = with lib; {
+ homepage = "https://pypi.org/project/Flask-Security-Too/";
+ description = "Simple security for Flask apps (fork)";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask/1.nix b/pkgs/development/python-modules/flask/1.nix
deleted file mode 100644
index 27f436c3c53c..000000000000
--- a/pkgs/development/python-modules/flask/1.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, itsdangerous, click, werkzeug, jinja2, pytest }:
-
-buildPythonPackage rec {
- version = "1.1.2";
- pname = "Flask";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060";
- };
-
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ];
-
- checkPhase = ''
- py.test
- '';
-
- # Tests require extra dependencies
- doCheck = false;
-
- meta = with lib; {
- homepage = "http://flask.pocoo.org/";
- description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix
new file mode 100644
index 000000000000..e7bda9378b19
--- /dev/null
+++ b/pkgs/development/python-modules/flatten-dict/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "flatten-dict";
+ version = "0.4.2";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "ianlini";
+ repo = pname;
+ rev = version;
+ hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "flatten_dict"
+ ];
+
+ meta = with lib; {
+ description = "Module for flattening and unflattening dict-like objects";
+ homepage = "https://github.com/ianlini/flatten-dict";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index bb271807a7b3..548e8534b5b2 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
- version = "0.27.40";
+ version = "0.28.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
- sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc=";
+ sha256 = "sha256-/dEIrTkioqHBJouqk9pTsR0Xhkd6FoIjjOc5HwMBGrI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix
index d099b7454544..d5b85d4e5bd1 100644
--- a/pkgs/development/python-modules/formbox/default.nix
+++ b/pkgs/development/python-modules/formbox/default.nix
@@ -2,15 +2,15 @@
buildPythonPackage rec {
pname = "formbox";
- version = "0.1.0";
+ version = "0.4.1";
format = "flit";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.6";
src = fetchFromSourcehut {
owner = "~cnx";
repo = pname;
rev = version;
- sha256 = "sha256-6OzmYqUC3mmrAMeMExI4rdVGUoWrxRuBfjKFYbHUlgE=";
+ sha256 = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk=";
};
propagatedBuildInputs = [ bleach markdown ];
diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix
index ee9a22c58f2e..b869d583fc8d 100644
--- a/pkgs/development/python-modules/fountains/default.nix
+++ b/pkgs/development/python-modules/fountains/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bea8EXw3b0CibhEREdY4FZouiiXP4y+UbbDXed7Ltwo=";
+ sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix
deleted file mode 100644
index 7f77616f2a4e..000000000000
--- a/pkgs/development/python-modules/freezegun/0.3.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python-dateutil
-, six
-, mock
-, nose
-, pytest
-}:
-
-buildPythonPackage rec {
- pname = "freezegun";
- version = "0.3.15";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b";
- };
-
- propagatedBuildInputs = [ python-dateutil six ];
- checkInputs = [ mock nose pytest ];
-
- meta = with lib; {
- description = "FreezeGun: Let your Python tests travel through time";
- homepage = "https://github.com/spulec/freezegun";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index 02579d97d287..139a4c562bbe 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "frozendict";
- version = "2.1.0";
+ version = "2.1.1";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd";
+ sha256 = "655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix
deleted file mode 100644
index bc19a31927af..000000000000
--- a/pkgs/development/python-modules/futures/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, python, stdenv }:
-
-buildPythonPackage rec {
- pname = "futures";
- version = "3.3.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794";
- };
-
- # This module is for backporting functionality to Python 2.x, it's builtin in py3k
- disabled = isPy3k;
-
- checkPhase = ''
- ${python.interpreter} test_futures.py
- '';
-
- doCheck = !stdenv.isDarwin;
-
- meta = with lib; {
- description = "Backport of the concurrent.futures package from Python 3.2";
- homepage = "https://github.com/agronholm/pythonfutures";
- license = licenses.bsd2;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix
new file mode 100644
index 000000000000..0df84510efd4
--- /dev/null
+++ b/pkgs/development/python-modules/gamble/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "gamble";
+ version = "0.10";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lb5x076blnnz2hj7k92pyq0drbjwsls6pmnabpvyvs4ddhz5w9w";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "gamble"
+ ];
+
+ meta = with lib; {
+ description = "Collection of gambling classes/tools";
+ homepage = "https://github.com/jpetrucciani/gamble";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jpetrucciani ];
+ };
+}
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index b6890fe3fdbc..15ba87400e33 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "GeoAlchemy2";
- version = "0.10.1";
+ version = "0.10.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062";
+ sha256 = "3db833746e11bc802b754751ec94eaab81009a9ad8fe647d461fe76d1a47a3fd";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index e9d68685a3f1..bdd2e63e07aa 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "glances-api";
- version = "0.3.2";
+ version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = version;
- sha256 = "sha256-zVK63SI8ZeVrY2iEEkgp8pq6RDheKeApb9/RWgZCKGI=";
+ sha256 = "sha256-F3jmYBZNzI4hRmH1J+S5RwxjouZNcUJOnD3QpX1J39s=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
index 398ee8eedf13..a8f658ac83a9 100644
--- a/pkgs/development/python-modules/glasgow/default.nix
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -5,7 +5,7 @@
, setuptools-scm
, pythonOlder
, sdcc
-, nmigen
+, amaranth
, fx2
, libusb1
, aiohttp
@@ -19,23 +19,23 @@
buildPythonPackage rec {
pname = "glasgow";
- version = "unstable-2021-03-02";
+ version = "unstable-2021-12-12";
disabled = pythonOlder "3.7";
# python software/setup.py --version
- realVersion = "0.1.dev1660+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
- rev = "41c48bbcee284d024e4249a81419fbbae674cf40";
- sha256 = "1fg8ps228930d70bczwmcwnrd1gvm02a58mxbpn8pyakwbwwa6hq";
+ rev = "e640a778c446b7e9812727e73c560d12aeb41d7c";
+ sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU=";
};
nativeBuildInputs = [ setuptools-scm sdcc ];
propagatedBuildInputs = [
setuptools
- nmigen
+ amaranth
fx2
libusb1
aiohttp
@@ -72,6 +72,6 @@ buildPythonPackage rec {
description = "Software for Glasgow, a digital interface multitool";
homepage = "https://github.com/GlasgowEmbedded/Glasgow";
license = licenses.bsd0;
- maintainers = with maintainers; [ emily ];
+ maintainers = with maintainers; [ emily thoughtpolice ];
};
}
diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix
index 32fdae1b3f2c..b091d2583b6b 100644
--- a/pkgs/development/python-modules/glcontext/default.nix
+++ b/pkgs/development/python-modules/glcontext/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "glcontext";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = version;
- sha256 = "16kwrfjijn9bnb48rk17wapmhxq6g9s59zczh65imyncb9k82wkc";
+ sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 8a774e660751..469c0d613b90 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "glean_parser";
- version = "4.3.1";
+ version = "4.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s=";
+ sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index d30a0c7eb1cb..ccef9ece3781 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -4,24 +4,47 @@
, boltons
, attrs
, face
-, pytest
+, pytestCheckHook
, pyyaml
+, pythonOlder
}:
buildPythonPackage rec {
pname = "glom";
version = "20.11.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12";
+ hash = "sha256-VAUQcrzMnNs+u9ivBVkZUTemHTCPBL/xlnjkthNQ6xI=";
};
- propagatedBuildInputs = [ boltons attrs face ];
+ propagatedBuildInputs = [
+ boltons
+ attrs
+ face
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pyyaml
+ ];
+
+ preCheck = ''
+ # test_cli.py checks the output of running "glom"
+ export PATH=$out/bin:$PATH
+ '';
+
+ disabledTests = [
+ # Test is outdated (was made for PyYAML 3.x)
+ "test_main_yaml_target"
+ ];
- checkInputs = [ pytest pyyaml ];
- # test_cli.py checks the output of running "glom"
- checkPhase = "PATH=$out/bin:$PATH pytest glom/test";
+ pythonImportsCheck = [
+ "glom"
+ ];
meta = with lib; {
homepage = "https://github.com/mahmoud/glom";
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index c4b0dbf200b3..27f6d8538d8b 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -9,7 +9,7 @@
let
pname = "gmpy2";
- version = "2.1.0b5";
+ version = "2.1.2";
in
buildPythonPackage {
@@ -21,11 +21,13 @@ buildPythonPackage {
owner = "aleaxit";
repo = "gmpy";
rev = "gmpy2-${version}";
- sha256 = "1mqzyp7qwqqyk6jbicgx22svdy2106xwhmhfvdf0vpnmwswcxclb";
+ sha256 = "sha256-ARCttNzRA+Ji2j2NYaSCDXgvoEg01T9BnYadyqON2o0=";
};
buildInputs = [ gmp mpfr libmpc ];
+ pythonImportsCheck = [ "gmpy2" ];
+
meta = with lib; {
description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
homepage = "https://github.com/aleaxit/gmpy/";
diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index a1f26845d346..0fb91f75ddaa 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
- version = "0.2.11";
+ version = "0.2.15";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
- sha256 = "14m2r3x1dgh3npnbspkp2214976669nnpqhbc26ib88qmn75kzad";
+ sha256 = "0di4w3sgl86hjj8yvhx430w6b2fkdzxyjb1147k7py4lqpw7snjj";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 9d548b685efd..d6dedff38e7b 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-api-core";
- version = "2.2.2";
+ version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997";
+ sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 185c7579e4f7..e5bbbc8cbcde 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "2.31.0";
+ version = "2.32.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3f64a5eee6fa03ab51806dccf48e342fda83fea60c290518c6a2dfdbf2de9efd";
+ sha256 = "619fe50155e73342c17aba4bbb2a08be8ce6ae00b795af383de7d6616b485c94";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix
deleted file mode 100644
index 225adf348d1a..000000000000
--- a/pkgs/development/python-modules/google-apputils/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pytz
-, gflags
-, python-dateutil
-, mox
-, python
-}:
-
-buildPythonPackage rec {
- pname = "google-apputils";
- version = "0.4.2";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7";
- };
-
- preConfigure = ''
- sed -i '/ez_setup/d' setup.py
- '';
-
- propagatedBuildInputs = [ pytz gflags python-dateutil mox ];
-
- checkPhase = ''
- ${python.executable} setup.py google_test
- '';
-
- # ERROR:root:Trying to access flag test_tmpdir before flags were parsed.
- doCheck = false;
-
- meta = with lib; {
- description = "Google Application Utilities for Python";
- homepage = "https://github.com/google/google-apputils";
- license = licenses.asl20;
- maintainers = with maintainers; [ SuperSandro2000 ];
- };
-}
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index d901bb78cddb..6cb405d3c146 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
- version = "2.5.2";
+ version = "2.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4c759ae99979d9f94ed0bdfe4937f41c81634f934ec11d25eb089430781eafec";
+ sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 903db740c09f..a06bf326e0c6 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "3.4.1";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fdc8cb68a3ee54780f673f06b3cce83a5bb5d600db7ad363c85e38bf45afb59c";
+ sha256 = "6e93c134669bbb7b79be4bd73329842c5e5f071f1fde624fc82233da42677021";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 5daa88ed9492..96a10e1a2221 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.30.1";
+ version = "2.32.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "4e3b5e3dcc475d5a601d84872ac0b63e059540be2251b1c4165c51106d572855";
+ sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 0e0d5982c6e2..bf9e8552aec1 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
- version = "3.6.1";
+ version = "3.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d";
+ sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE=";
};
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 7f26b2df28ca..3badd796121e 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
- version = "3.1.1";
+ version = "3.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e012d76aa32b918c71392c11e1c727328c1570364f8d8e0676e52bc64c57a7af";
+ sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 8773b09e59a9..a3418e3a9029 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0b249fa87deb57f5c7107a7d5d303673590a6524a7f113fc95f87493f3328606";
+ sha256 = "3a757a3fafab46f28ffd2465ae06c5f87071aee1b41aee13f44255074483d480";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 816e56364b16..b817c50ad5a5 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-language";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "e0d71b72e2639af0424308a71f871c3fbf7ea86bdcbac1d91910fe2e1b419944";
+ sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index 21add76d0ad7..467fe9542474 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
rm tests/system/test_system.py tests/unit/test__gapic.py
'';
- pythonImortsCheck = [
+ pythonImportsCheck = [
"google.cloud.logging"
"google.cloud.logging_v2"
];
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index ceacab720aee..aa49340f24a3 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c5aaf6dbdf8bb1425bd42ef482a6c0ecc4b4d1718d49267d510799015c6ff1d2";
+ sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 404a51529934..e982aefae5a9 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494";
+ sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index f9aa3e43553f..5f2737912e2c 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.11.1";
+ version = "2.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3a15400d2fab2ec161c9b647730e8ba92feb9cbe6a1c0c7734ec8e8941290dbd";
+ sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index f74944a45e2e..a90f9c73cc13 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.44.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001";
+ sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index e055d462b1f3..c1b58c0e1c26 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "2fd2222901a7d8ba65f28f9019cb41f5d4c952d012f020bdde105527a3f5ae43";
+ sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 24775464a120..d4551b4954a5 100644
--- a/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-testutils";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9c60ea86b28998935875b5aea0b89b0a3aac5e433e0039236f633c5d0ff5f8b8";
+ sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs=";
};
propagatedBuildInputs = [ click google-auth six ];
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 06c1eeb857f9..05ac66c0875f 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e8e272ab54be00285c8f9451081d833980c9fc2a1eff828448dfe315dfa61250";
+ sha256 = "0a76bed3cf48cf72d4aa50329d5da2bbc008c5c7dd57326854fc038536e107f1";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index 27211ed2095c..02a0f6f08d93 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -1,19 +1,21 @@
{ lib
, aiohttp
+, asynctest
, buildPythonPackage
+, coreutils
, fetchFromGitHub
, google-auth
, google-auth-oauthlib
, google-cloud-pubsub
-, pythonOlder
-, requests_oauthlib
, pytest-aiohttp
, pytestCheckHook
+, pythonOlder
+, requests_oauthlib
}:
buildPythonPackage rec {
pname = "google-nest-sdm";
- version = "1.3.0";
+ version = "1.5.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +24,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
- sha256 = "sha256-E0e4lLUBzHKA3clmb/JUBE0KGciQ1xrmLTSeSkGDsWo=";
+ sha256 = "sha256-8Y3ixkDl/AmXQMOY+29og5njMh9M2qjwWBGCsiqX5PU=";
};
propagatedBuildInputs = [
@@ -34,10 +36,17 @@ buildPythonPackage rec {
];
checkInputs = [
+ asynctest
+ coreutils
pytest-aiohttp
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace tests/event_media_test.py \
+ --replace "/bin/echo" "${coreutils}/bin/echo"
+ '';
+
pythonImportsCheck = [
"google_nest_sdm"
];
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index b239dfc6e998..f6fc6db7f387 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5affd12421ba75f4c04f5678aef62f78aae2a7ae74aa23614c6f3799d2784b28";
+ sha256 = "3b1b52ec3004ad6a6927a015b0572878a0a56314caaf1e62b07550e7a2e09465";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix
index 4cd03103d850..86e4a87a8681 100644
--- a/pkgs/development/python-modules/gpxpy/default.nix
+++ b/pkgs/development/python-modules/gpxpy/default.nix
@@ -1,15 +1,15 @@
-{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, isPy3k }:
+{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, pythonOlder }:
buildPythonPackage rec {
pname = "gpxpy";
- version = "1.4.2";
- disabled = !isPy3k;
+ version = "1.5.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tkrajina";
repo = pname;
rev = "v${version}";
- sha256 = "1r5gb660nrkrdbw5m5h1n5k10npcfv9bxqv92z55ds8r7rw2saz6";
+ sha256 = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk=";
};
propagatedBuildInputs = [ lxml ];
diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix
index 6056d215d227..c4e7eb4d7446 100644
--- a/pkgs/development/python-modules/grandalf/default.nix
+++ b/pkgs/development/python-modules/grandalf/default.nix
@@ -3,20 +3,22 @@
, fetchFromGitHub
, pyparsing
, future
-, pytest
-, pytest-runner
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "grandalf";
- version = "0.6";
+ version = "0.7";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # fetch from github to acquire tests
src = fetchFromGitHub {
owner = "bdcht";
- repo = "grandalf";
+ repo = pname;
rev = "v${version}";
- sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg";
+ hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4=";
};
propagatedBuildInputs = [
@@ -24,18 +26,22 @@ buildPythonPackage rec {
future
];
- checkInputs = [ pytest pytest-runner ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- patches = [ ./no-setup-requires-pytestrunner.patch ];
+ patches = [
+ ./no-setup-requires-pytestrunner.patch
+ ];
- checkPhase = ''
- pytest tests
- '';
+ pythonImportsCheck = [
+ "grandalf"
+ ];
meta = with lib; {
- description = "A python package made for experimentations with graphs and drawing algorithms";
+ description = "Module for experimentations with graphs and drawing algorithms";
homepage = "https://github.com/bdcht/grandalf";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ cmcdragonkai ];
};
}
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/default.nix
index c8725dfd1167..c8725dfd1167 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix
index 8ef95b460ae2..33b4c437dde2 100644
--- a/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "1.1.1";
pname = "grappelli_safe";
src = fetchPypi {
inherit pname version;
- sha256 = "84c03ec5373341d980a76480d992389e286fbc50048e91bc2e5c876d02873cc5";
+ sha256 = "ee34b3e2a3711498b1f8da3d9daa8a1239efdf255a212181742b6a5890fac039";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix
index 5f72411e9e89..5a17b4679e10 100644
--- a/pkgs/development/python-modules/greeclimate/default.nix
+++ b/pkgs/development/python-modules/greeclimate/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
- version = "1.0.1";
+ version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = "v${version}";
- hash = "sha256-O9SaEveZntb7VWL5k1WjTDK9fXhTWFIsVh5v7NKASnQ=";
+ hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index e4a3401109b4..ccff2f21e1f9 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "green";
- version = "3.3.0";
+ version = "3.4.1";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575";
+ sha256 = "5dda2d2a277012227011f8f21523d70a550ebe5d47cc890fa16b9fcd9a91da53";
};
patches = [
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 17fb02fd10d9..8de737eeeddc 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -4,6 +4,7 @@
, poetry-core
, pytestCheckHook
, python-gvm
+, pythonAtLeast
, pythonOlder
}:
@@ -36,6 +37,8 @@ buildPythonPackage rec {
disabledTests = [
# Don't test sending
"SendTargetTestCase"
+ ] ++ lib.optionals (pythonAtLeast "3.10") [
+ "HelpFormattingParserTestCase"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index d5c5a41abc04..c20ff49b5cb0 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "0.14.0";
+ version = "0.21.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-Olwol/DhsVJznxpiMB57zkPuco0RBxMy8cfzSQMZZrU=";
+ sha256 = "sha256-oD4HXdzlQJZ/+ceF9zfmGs6S8DEVoxzLv5h/IURJnOY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix
index 1832803388fc..3b5e0a218b78 100644
--- a/pkgs/development/python-modules/hangups/default.nix
+++ b/pkgs/development/python-modules/hangups/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hangups";
- version = "0.4.15";
+ version = "0.4.17";
disabled = pythonOlder "3.6";
@@ -26,13 +26,12 @@ buildPythonPackage rec {
owner = "tdryer";
repo = "hangups";
rev = "v${version}";
- sha256 = "sha256-47OvfFK92AtX6KiYnvro2B17RfQWyzgsgvOfl5T3Kag=";
+ hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q=";
};
postPatch = ''
substituteInPlace setup.py \
- --replace "protobuf>=3.1.0,<3.17" "protobuf" \
- --replace "async-timeout>=2,<4" "async-timeout" \
+ --replace "protobuf>=3.1.0,<3.20" "protobuf" \
--replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
'';
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index c58e50bee868..63a2e941f0fa 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "hap-python";
- version = "4.3.0";
+ version = "4.4.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ikalchev";
repo = "HAP-python";
rev = "v${version}";
- sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM=";
+ sha256 = "sha256-dSiI2W4U4FYwMRBInpxb/wkQLKxPzLHIkLPNgiZEhUA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 48788537a660..d1228fc0c5f5 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.50.0";
+ version = "0.51.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "sha256-0E8eiHzqbxHbtAd97MbvFMRDWTu25E9x/44oNGC4mUM=";
+ sha256 = "sha256-qN7AXs4hJpuP+GaxjOPR2CqKMYyDJxTrCuE5HreZnhU=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 10d333301641..ecefce19aede 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "holidays";
- version = "0.11.3.1";
+ version = "0.12";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-SFWv4Ov0KO+8+EhHeCi4ifhRW+f08VriZoKRk2nZJ3Q=";
+ sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix
index fb10dc516831..2a1cb8790386 100644
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@@ -7,6 +7,7 @@
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
+, pythonAtLeast
, pythonOlder
, pytest-aiohttp
, pytest-asyncio
@@ -54,11 +55,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- substituteInPlace homematicip/aio/connection.py \
- --replace ", loop=self._loop" ""
- '';
-
disabledTests = [
# Assert issues with datetime
"test_contact_interface_device"
@@ -82,6 +78,11 @@ buildPythonPackage rec {
"test_home_unknown_types"
# Requires network access
"test_websocket"
+ ] ++ lib.optionals (pythonAtLeast "3.10") [
+ "test_connection_lost"
+ "test_user_disconnect_and_reconnect"
+ "test_ws_message"
+ "test_ws_no_pong"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix
index 1172b0195132..08ea5a2b3e98 100644
--- a/pkgs/development/python-modules/html5lib/default.nix
+++ b/pkgs/development/python-modules/html5lib/default.nix
@@ -5,7 +5,7 @@
, webencodings
, mock
, pytest-expect
-, pytestCheckHook_5
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -22,10 +22,12 @@ buildPythonPackage rec {
webencodings
];
+ # latest release not compatible with pytest 6
+ doCheck = false;
checkInputs = [
mock
pytest-expect
- pytestCheckHook_5
+ pytestCheckHook
];
meta = {
diff --git a/pkgs/development/python-modules/httpagentparser/default.nix b/pkgs/development/python-modules/httpagentparser/default.nix
new file mode 100644
index 000000000000..e0c9dd09bcba
--- /dev/null
+++ b/pkgs/development/python-modules/httpagentparser/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "httpagentparser";
+ version = "1.9.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY=";
+ };
+
+ # PyPi version does not include test directory
+ doCheck = false;
+
+ pythonImportsCheck = [ "httpagentparser" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/shon/httpagentparser";
+ description = "Extracts OS Browser etc information from http user agent string";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 3f48af86e581..9a8a8853780a 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -48,7 +48,11 @@ buildPythonPackage rec {
sed -i "/--cov/d" setup.cfg
'';
- disabledTests = lib.optionals (stdenv.isDarwin) [
+ disabledTests = [
+ # ValueError: Unable to load PEM file.
+ # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140
+ "test_client_cert_password_verified"
+ ] ++ lib.optionals (stdenv.isDarwin) [
# fails with HTTP 408 Request Timeout, instead of expected 200 OK
"test_timeout_subsequent"
];
diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix
deleted file mode 100644
index 92ed5c6616e0..000000000000
--- a/pkgs/development/python-modules/httpretty/0.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, tornado
-, requests
-, httplib2
-, sure
-, nose
-, nose-exclude
-, coverage
-, rednose
-, nose-randomly
-, six
-, mock
-}:
-
-buildPythonPackage rec {
- pname = "httpretty";
- version = "0.9.7";
-
- # drop this for version > 0.9.7
- # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
- doCheck = lib.versionAtLeast version "0.9.8";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe";
- };
-
- propagatedBuildInputs = [ six ];
-
- checkInputs = [ nose sure coverage mock rednose
- # Following not declared in setup.py
- nose-randomly requests tornado httplib2 nose-exclude
- ];
-
- __darwinAllowLocalNetworking = true;
-
- # Those flaky tests are failing intermittently on all platforms
- NOSE_EXCLUDE = lib.concatStringsSep "," [
- "tests.functional.test_httplib2.test_callback_response"
- "tests.functional.test_requests.test_streaming_responses"
- "tests.functional.test_httplib2.test_callback_response"
- "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2"
- ];
-
- meta = with lib; {
- homepage = "https://httpretty.readthedocs.org/";
- description = "HTTP client request mocking tool";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix
index b88fc9633799..77f0c75e0103 100644
--- a/pkgs/development/python-modules/humanfriendly/default.nix
+++ b/pkgs/development/python-modules/humanfriendly/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "humanfriendly";
- version = "9.2";
+ version = "10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48";
+ sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic;
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index d4d091c36f8b..1bd1e6650c8d 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -8,11 +8,15 @@
, mnemonic
, pyaes
, typing-extensions
+, pythonOlder
}:
buildPythonPackage rec {
pname = "hwi";
version = "2.0.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bitcoin-core";
@@ -34,18 +38,21 @@ buildPythonPackage rec {
# make compatible with libusb1 2.x
postPatch = ''
substituteInPlace setup.py \
- --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7'
+ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \
+ --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4',"
'';
# tests require to clone quite a few firmwares
doCheck = false;
- pythonImportsCheck = [ "hwilib" ];
+ pythonImportsCheck = [
+ "hwilib"
+ ];
- meta = {
+ meta = with lib; {
description = "Bitcoin Hardware Wallet Interface";
homepage = "https://github.com/bitcoin-core/hwi";
- license = with lib.licenses; [ mit ];
- maintainers = with lib.maintainers; [ prusnak ];
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ prusnak ];
};
}
diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix
deleted file mode 100644
index 47bc8860bc54..000000000000
--- a/pkgs/development/python-modules/hypothesis/2.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, isPy3k, attrs, coverage, enum34, pexpect
-, doCheck ? true, pytest, pytest-xdist, flaky, mock
-, sortedcontainers
-}:
-buildPythonPackage rec {
- # https://hypothesis.readthedocs.org/en/latest/packaging.html
-
- # Hypothesis has optional dependencies on the following libraries
- # pytz fake_factory django numpy pytest
- # If you need these, you can just add them to your environment.
-
- version = "4.57.1";
- pname = "hypothesis";
-
- # Use github tarballs that includes tests
- src = fetchFromGitHub {
- owner = "HypothesisWorks";
- repo = "hypothesis-python";
- rev = "hypothesis-python-${version}";
- sha256 = "1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds";
- };
-
- postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
-
- propagatedBuildInputs = [
- attrs
- coverage
- sortedcontainers
- ] ++ lib.optional (!isPy3k) enum34;
-
- checkInputs = [ pytest pytest-xdist flaky mock pexpect ];
- inherit doCheck;
-
- checkPhase = ''
- rm tox.ini # This file changes how py.test runs and breaks it
- py.test tests/cover
- '';
-
- meta = with lib; {
- description = "A Python library for property based testing";
- homepage = "https://github.com/HypothesisWorks/hypothesis";
- license = licenses.mpl20;
- };
-}
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 4cf8acf70872..9d9c6b6c91fa 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -18,14 +18,14 @@ buildPythonPackage rec {
# If you need these, you can just add them to your environment.
pname = "hypothesis";
- version = "6.27.1";
+ version = "6.30.1";
# Use github tarballs that includes tests
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
- sha256 = "05kfz041vrd9fy8gl8ch05g806jj4j6l1cnwhqgygagn9z3aq1jx";
+ sha256 = "0nk57v03q7ss7dbsfd9gi3lzl6ngplk7axbiksm26dgkhh4swk8y";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 1627159e6fbd..17f4553297ff 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -1,10 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27, pythonAtLeast
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, atpublic
+, cached-property
+, clickhouse-driver
+, click
+, dask
, graphviz
+, importlib-metadata
, multipledispatch
, numpy
, pandas
+, parsy
, pyarrow
, pytest
+, pytest-mock
+, pytest-xdist
, pytz
, regex
, requests
@@ -12,54 +25,117 @@
, tables
, toolz
}:
+let
+ # ignore tests for which dependencies are not available
+ backends = [
+ "csv"
+ "dask"
+ "hdf5"
+ "pandas"
+ "parquet"
+ "sqlite"
+ ];
+
+ backendsString = lib.concatStringsSep " " backends;
+
+ ibisTestingData = fetchFromGitHub {
+ owner = "ibis-project";
+ repo = "testing-data";
+ rev = "743201a35c6b968cf55b054f9d28949ea15d1f0a";
+ sha256 = "sha256-xuSE6wHP3aF8lnEE2SuFbTRBu49ecRmc1F3HPcszptI=";
+ };
+in
buildPythonPackage rec {
pname = "ibis-framework";
- version = "1.3.0";
- disabled = isPy27 || pythonAtLeast "3.8";
+ version = "2.1.1";
+ disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7";
+ src = fetchFromGitHub {
+ repo = "ibis";
+ owner = "ibis-project";
+ rev = version;
+ sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
};
- patches = [
- # fix tests for pandas 1.1
- (fetchpatch {
- url = "https://github.com/ibis-project/ibis/commit/53ef3cefc4ae90d61f3612310cb36da2bcd11305.diff";
- sha256 = "1i5yjmqridjqpggiinsjaz5spcxca5bd48vy7a0mj4mm1b5flw2m";
- })
- ];
-
propagatedBuildInputs = [
+ atpublic
+ cached-property
+ clickhouse-driver
+ dask
+ graphviz
multipledispatch
numpy
pandas
+ parsy
+ pyarrow
pytz
regex
- toolz
- sqlalchemy
requests
- graphviz
+ sqlalchemy
tables
- pyarrow
- ];
+ toolz
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
checkInputs = [
+ pytestCheckHook
+ click
pytest
+ pytest-mock
+ pytest-xdist
+ ];
+
+ # these tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291
+ disabledTests = [
+ "test_summary_numeric"
+ "test_summary_non_numeric"
+ "test_batting_most_hits"
+ "test_join_with_window_function"
+ "test_where_long"
+ "test_quantile_groupby"
+ "test_summary_numeric"
+ "test_summary_numeric_group_by"
+ "test_summary_non_numeric"
+ "test_searched_case_column"
+ "test_simple_case_column"
+ "test_summary_non_numeric_group_by"
];
- # ignore tests which require test dataset, or frameworks not available
- checkPhase = ''
- pytest ibis \
- --ignore=ibis/tests/all \
- --ignore=ibis/{sql,spark}
+ pytestFlagsArray = [
+ "--numprocesses $NIX_BUILD_CORES"
+ "ibis/tests"
+ "ibis/backends/tests"
+ "ibis/backends/{${lib.concatStringsSep "," backends}}/tests"
+ ];
+
+ preCheck = ''
+ set -euo pipefail
+
+ export IBIS_TEST_DATA_DIRECTORY
+ IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)"
+
+ # copy the test data to a writable directory
+ cp -r ${ibisTestingData}/* "$IBIS_TEST_DATA_DIRECTORY"
+
+ find "$IBIS_TEST_DATA_DIRECTORY" -type d -exec chmod u+rwx {} +
+ find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} +
+
+ # load data
+ for backend in ${backendsString}; do
+ python ci/datamgr.py "$backend" &
+ done
+
+ wait
+
+ export PYTEST_BACKENDS="${backendsString}"
'';
+ pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends);
+
meta = with lib; {
description = "Productivity-centric Python Big Data Framework";
homepage = "https://github.com/ibis-project/ibis";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc cpcloud ];
};
}
diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 1f8b4063dd79..64ecd3c496bb 100644
--- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
- version = "3.13.2";
+ version = "3.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9c615b3a6e9d9dc1c69d8f38742b156e12408521fa180a66558bbb7b850bbbc2";
+ sha256 = "695c4125436f4f8354a67bc85af9ac306b66911c75d19ade25072dd436b55c4e";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index ed87f3678b15..34a36642976d 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage rec {
disabledTests = [
# Failure seems to be related to arrow > 1.0
"test_event"
+ # Broke with TatSu 5.7:
+ "test_many_lines"
];
pythonImportsCheck = [ "ics" ];
diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix
index 9031b7022d8e..b0e9b7d57065 100644
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "idasen";
- version = "0.8.1";
+ version = "0.8.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM";
repo = "idasen";
rev = "v${version}";
- sha256 = "122bhbc3zqqm4x1x7a7mydvxxjrdssnqyxyqg0lbgxgn5rm8wbdd";
+ sha256 = "sha256-s8CnYMUVl2VbGbVxICSaKH5DxTA+NP/zPX1z7vfMqi4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 4497683932ce..79d141c6a8bc 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
- version = "2.4.2";
+ version = "2.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6YduKmXqgqXAqlK2cd1CkdI7nzK0Dg65E+nl6vhMAow=";
+ sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/idna/2.nix b/pkgs/development/python-modules/idna/2.nix
deleted file mode 100644
index 9a1c1dc271f1..000000000000
--- a/pkgs/development/python-modules/idna/2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "idna";
- version = "2.10";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6";
- };
-
- checkInputs = [ pytestCheckHook ];
-
- meta = {
- homepage = "https://github.com/kjd/idna/";
- description = "Internationalized Domain Names in Applications (IDNA)";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index f5b21d58866a..f7409dc08236 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "igraph";
- version = "0.9.8";
+ version = "0.9.9";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "igraph";
repo = "python-igraph";
rev = version;
- sha256 = "sha256-RtvT5/LZ/xP68yBB7DDKJGeNCiX4HyPTCuk+Ijd2nFs=";
+ hash = "sha256-jHK8whCg+WitRSL5LmkqfdqiAdi9vZPicygzKThnW2U=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix
index 2c535ea79b57..4fe56c616146 100644
--- a/pkgs/development/python-modules/ihatemoney/default.nix
+++ b/pkgs/development/python-modules/ihatemoney/default.nix
@@ -39,25 +39,9 @@
, psycopg2 # optional, for postgresql support
, flask_testing
, pytestCheckHook
+, fetchpatch
}:
-# ihatemoney is not really a library. It will only ever be imported
-# by the interpreter of uwsgi. So overrides for its depencies are fine.
-let
- # sqlalchemy-continuum requires sqlalchemy < 1.4
- pinned_sqlalchemy = sqlalchemy.overridePythonAttrs (
- old: rec {
- pname = "SQLAlchemy";
- version = "1.3.24";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb";
- };
- }
- );
-in
-
buildPythonPackage rec {
pname = "ihatemoney";
version = "5.1.1";
@@ -81,16 +65,7 @@ buildPythonPackage rec {
flask-babel
flask-cors
flask_mail
- (
- flask_migrate.override {
- flask_sqlalchemy = flask_sqlalchemy.override {
- sqlalchemy = pinned_sqlalchemy;
- };
- alembic = alembic.override {
- sqlalchemy = pinned_sqlalchemy;
- };
- }
- )
+ flask_migrate
flask-restful
flask-talisman
flask_wtf
@@ -103,40 +78,27 @@ buildPythonPackage rec {
pytz
requests
six
- (
- (
- sqlalchemy-continuum.override {
- sqlalchemy = pinned_sqlalchemy;
- sqlalchemy-utils = sqlalchemy-utils.override {
- sqlalchemy = pinned_sqlalchemy;
- };
- sqlalchemy-i18n = sqlalchemy-i18n.override {
- sqlalchemy = pinned_sqlalchemy;
- sqlalchemy-utils = sqlalchemy-utils.override {
- sqlalchemy = pinned_sqlalchemy;
- };
- };
- flask_sqlalchemy = flask_sqlalchemy.override {
- sqlalchemy = pinned_sqlalchemy;
- };
- }
- ).overridePythonAttrs (
- old: {
- doCheck = false;
- }
- )
- )
+ sqlalchemy-continuum
werkzeug
wtforms
psycopg2
debts
];
- # upstream performed the update without needing to patch the code
- # the original patch does not apply, sadly
- # https://github.com/spiral-project/ihatemoney/pull/912
+ patches = [
+ # fix build with wtforms 3. remove with next release
+ (fetchpatch {
+ url = "https://github.com/spiral-project/ihatemoney/commit/40ce32d9fa58a60d26a4d0df547b8deb709c330d.patch";
+ sha256 = "sha256-2ewOu21qhq/AOZaE9qrF5J6HH0h6ohFgjDb+BYjJnuQ=";
+ excludes = [ "setup.cfg" ];
+ })
+ ];
+
postPatch = ''
- substituteInPlace setup.cfg --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2"
+ substituteInPlace setup.cfg \
+ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \
+ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \
+ --replace "WTForms>=2.3.1,<2.4" "WTForms"
'';
checkInputs = [
@@ -144,6 +106,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportChecks = [ "ihatemoney" ];
+
disabledTests = [
"test_notifications" # requires running service.
"test_invite" # requires running service.
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index f27c9fded9b2..0a97a27d17f8 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "imageio";
- version = "2.12.0";
+ version = "2.13.2";
disabled = isPy27;
src = fetchPypi {
- sha256 = "c416dd68328ace8536ff333cbb8927954036be56e201fed416e53e8f95e08a6c";
+ sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3";
inherit pname version;
};
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index bb29504d63e6..b1e5e9197522 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "imbalanced-learn";
- version = "0.8.1";
+ version = "0.9.0";
disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2
src = fetchPypi {
inherit pname version;
- sha256 = "eaf576b1ba3523a0facf3aaa483ca17e326301e53e7678c54d73b7e0250edd43";
+ sha256 = "836a4c137cc3c10310d4f6cd5ec34600ff488d7f8c243a997c3f9b551c91d0b2";
};
propagatedBuildInputs = [ scikit-learn ];
diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index ee11e1280c15..9a6a59f6b8d4 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -1,4 +1,20 @@
-{ lib, pillow, fetchPypi, buildPythonPackage, isPy27, pikepdf }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, pikepdf
+, pillow
+, stdenv
+, exiftool
+, ghostscript
+, imagemagick
+, mupdf
+, netpbm
+, numpy
+, poppler_utils
+, pytestCheckHook
+, scipy
+}:
buildPythonPackage rec {
pname = "img2pdf";
@@ -15,14 +31,35 @@ buildPythonPackage rec {
pillow
];
- # no tests exectuted
- doCheck = false;
+ # https://gitlab.mister-muffin.de/josch/img2pdf/issues/128
+ doCheck = !stdenv.isAarch64;
+
+ checkInputs = [
+ exiftool
+ ghostscript
+ imagemagick
+ mupdf
+ netpbm
+ numpy
+ poppler_utils
+ pytestCheckHook
+ scipy
+ ];
+
+ preCheck = ''
+ export img2pdfprog="$out/bin/img2pdf"
+ '';
+
+ disabledTests = [
+ "test_tiff_rgb"
+ ];
+
+ pythonImportsCheck = [ "img2pdf" ];
meta = with lib; {
description = "Convert images to PDF via direct JPEG inclusion";
homepage = "https://gitlab.mister-muffin.de/josch/img2pdf";
license = licenses.lgpl2;
- platforms = platforms.unix;
- maintainers = [ maintainers.veprbl ];
+ maintainers = with maintainers; [ veprbl dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 3faf61d169be..1b99cd05f03b 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "iminuit";
- version = "2.8.4";
+ version = "2.9.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0";
+ sha256 = "656410ceffead79a52d3d727fdcd2bac78d7774239bef0efc3b7a86bae000ff3";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/importlib-metadata/2.nix b/pkgs/development/python-modules/importlib-metadata/2.nix
deleted file mode 100644
index f50b2c07c1da..000000000000
--- a/pkgs/development/python-modules/importlib-metadata/2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, zipp
-, pathlib2
-, contextlib2
-, configparser
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "importlib-metadata";
- version = "2.1.1";
-
- src = fetchPypi {
- pname = "importlib_metadata";
- inherit version;
- sha256 = "1pdmsmwagimn0lsl4x7sg3skcr2fvzqpv2pjd1rh7yrm5gzrxpmq";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
-
- propagatedBuildInputs = [ zipp ]
- ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ];
-
- # Cyclic dependencies
- doCheck = false;
-
- pythonImportsCheck = [ "importlib_metadata" ];
-
- meta = with lib; {
- description = "Read metadata from Python packages";
- homepage = "https://importlib-metadata.readthedocs.io/";
- license = licenses.asl20;
- };
-}
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 9e3c7be8f4a1..9eb9bd48d47e 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.24.0";
+ version = "1.25.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "0w0pw87fnxms88f3dadyhxdgms4rzvcww18h6l87wnqc6wxa6paw";
+ sha256 = "0anziqlczzc9qmz1mrk8yapn0pc18wz2pknyghyj5qpym3w2azas";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
new file mode 100644
index 000000000000..a19f27a0a753
--- /dev/null
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, flit-core
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "installer";
+ version = "0.3.0";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "pradyunsg";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI=";
+ };
+
+ nativeBuildInputs = [ flit-core ];
+
+ checkInputs = [
+ pytestCheckHook
+ mock
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/pradyunsg/installer";
+ description = "A low-level library for installing a Python package from a wheel distribution.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud fridh ];
+ };
+}
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index b87892906072..d197ba9691bf 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "internetarchive";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ebd11ecd038c71e75a3aef8d87750b46480169ecaefb23074c4ae48440bf2836";
+ sha256 = "fa89dc4be3e0a0aee24810a4a754e24adfd07edf710c645b4f642422c6078b8d";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
deleted file mode 100644
index b29ee9179287..000000000000
--- a/pkgs/development/python-modules/ipaddr/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "ipaddr";
- version = "2.2.0";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
- };
-
- meta = with lib; {
- description = "Google's IP address manipulation library";
- homepage = "https://github.com/google/ipaddr-py";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix
new file mode 100644
index 000000000000..1b8b7f002ae3
--- /dev/null
+++ b/pkgs/development/python-modules/ipwhl/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut
+, ipfs, packaging, tomli }:
+
+buildPythonPackage rec {
+ pname = "ipwhl";
+ version = "1.0.0";
+ format = "flit";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromSourcehut {
+ owner = "~cnx";
+ repo = "ipwhl-utils";
+ rev = version;
+ sha256 = "sha256-KstwdmHpn4ypBNpX56NeStqdzy5RElMTW1oR2hCtJ7c=";
+ };
+
+ buildInputs = [ ipfs ];
+ propagatedBuildInputs = [ packaging tomli ];
+ doCheck = false; # there's no test
+ pythonImportsCheck = [ "ipwhl" ];
+
+ meta = with lib; {
+ description = "Utilities for the InterPlanetary Wheels";
+ homepage = "https://git.sr.ht/~cnx/ipwhl-utils";
+ license = licenses.agpl3Plus;
+ maintainers = [ maintainers.McSinyx ];
+ };
+}
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index f18750af1ffb..1a34dfaf65b2 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "ipykernel";
- version = "6.5.1";
+ version = "6.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "dd27172bccbbcfef952991e49372e4c6fd1c14eed0df05ebd5b4335cb27a81a2";
+ sha256 = "3a227788216b43982d9ac28195949467627b0d16e6b8af9741d95dcaa8c41a89";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipython/7.16.nix b/pkgs/development/python-modules/ipython/7.16.nix
deleted file mode 100644
index 1f62cc9bc18d..000000000000
--- a/pkgs/development/python-modules/ipython/7.16.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchPypi
-, pythonOlder
-# Build dependencies
-, glibcLocales
-# Test dependencies
-, nose
-, pygments
-# Runtime dependencies
-, jedi
-, decorator
-, pickleshare
-, traitlets
-, prompt-toolkit
-, pexpect
-, appnope
-, backcall
-}:
-
-buildPythonPackage rec {
- pname = "ipython";
- version = "7.16.1";
- disabled = pythonOlder "3.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf";
- };
-
- prePatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace setup.py --replace "'gnureadline'" " "
- '';
-
- buildInputs = [ glibcLocales ];
-
- checkInputs = [ nose pygments ];
-
- propagatedBuildInputs = [
- jedi
- decorator
- pickleshare
- traitlets
- prompt-toolkit
- pygments
- pexpect
- backcall
- ] ++ lib.optionals stdenv.isDarwin [appnope];
-
- LC_ALL="en_US.UTF-8";
-
- doCheck = false; # Circular dependency with ipykernel
-
- checkPhase = ''
- nosetests
- '';
-
- pythonImportsCheck = [
- "IPython"
- ];
-
- meta = with lib; {
- description = "IPython: Productive Interactive Computing";
- homepage = "http://ipython.org/";
- license = licenses.bsd3;
- maintainers = with maintainers; [ bjornfor fridh ];
- };
-}
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 2065dc2349fd..73ead288ee49 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.29.0";
+ version = "7.30.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa";
+ sha256 = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97";
};
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 423ec4ecf292..15747d3f70d1 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "irc";
- version = "19.0.1";
+ version = "20.0.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "99fd5d1fa1d054dee4fbb81e0d5193dc1e8200db751d5da9a97850a62162b9ab";
+ sha256 = "59acb8d69d61a0cbd290e77e6ff10a8c7f2201fb8c7b7d5a195b5883d0c40b0a";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix
index 3a255ac047e5..a5eb03dc8eb6 100644
--- a/pkgs/development/python-modules/iso8601/default.nix
+++ b/pkgs/development/python-modules/iso8601/default.nix
@@ -1,25 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
+, hypothesis
, pytestCheckHook
+, pytz
+, pythonOlder
}:
buildPythonPackage rec {
pname = "iso8601";
- version = "0.1.16";
+ version = "1.0.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-NlMvd8yABZTo8WZB7a5/G695MvBdjlCFRblfxTxtyFs=";
+ sha256 = "sha256-J/UDIg5oRdnblU+yErlbA2LYt+bBsjJqhwYcPek1lLE=";
};
checkInputs = [
+ hypothesis
pytestCheckHook
+ pytz
];
- pytestFlagsArray = [ "iso8601" ];
+ pytestFlagsArray = [
+ "iso8601"
+ ];
- pythonImportsCheck = [ "iso8601" ];
+ pythonImportsCheck = [
+ "iso8601"
+ ];
meta = with lib; {
description = "Simple module to parse ISO 8601 dates";
diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index b55fb9156814..f708391cba21 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -52,6 +52,7 @@ buildPythonPackage rec {
disabledTests = [
"test_run" # doesn't like paths in /build
+ "test_fuzz_show_unified_diff" # flakey
"test_pyi_formatting_issue_942"
"test_requirements_finder"
"test_pipfile_finder"
diff --git a/pkgs/development/python-modules/itanium_demangler/default.nix b/pkgs/development/python-modules/itanium_demangler/default.nix
index c67259eee0f6..ade063a625ae 100644
--- a/pkgs/development/python-modules/itanium_demangler/default.nix
+++ b/pkgs/development/python-modules/itanium_demangler/default.nix
@@ -1,30 +1,36 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
-, lib
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
- pname = "itanium_demangler";
+ pname = "itanium-demangler";
version = "1.0"; # pulled from pypi version
src = fetchFromGitHub {
owner = "whitequark";
- repo = "python-${pname}";
+ repo = "python-itanium_demangler";
rev = "29c77860be48e6dafe3496e4d9d0963ce414e366";
- sha256 = "0qm95l6542nk63986w9lgzkxg824l31714i584s02rh9xwfg1xfx";
+ hash = "sha256-3fXwHO8JZgE0QSWScMKgRKDX5380cYPSMNMKUgwtqWI=";
};
- checkInputs = [ pytest ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- pytest tests/test.py
- '';
+ pytestFlagsArray = [
+ "tests/test.py"
+ ];
+
+ pythonImportsCheck = [
+ " itanium_demangler "
+ ];
meta = with lib; {
- description = "A pure Python parser for the Itanium C++ ABI symbol mangling language";
+ description = "Python parser for the Itanium C++ ABI symbol mangling language";
homepage = "https://github.com/whitequark/python-itanium_demangler";
license = licenses.bsd0;
- maintainers = [ maintainers.pamplemousse ];
+ maintainers = with maintainers; [ pamplemousse ];
};
}
diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix
new file mode 100644
index 000000000000..f9afc4c5cb36
--- /dev/null
+++ b/pkgs/development/python-modules/itemdb/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "itemdb";
+ version = "1.1.1";
+
+ # PyPI tarball doesn't include tests directory
+ src = fetchFromGitHub {
+ owner = "almarklein";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0ksad5j91nlbsn0a11clf994qz7r9ijand5hxnjhgd66i9hl3y78";
+ };
+
+ meta = with lib; {
+ description = "Easy transactional database for Python dicts, backed by SQLite";
+ license = licenses.bsd2;
+ homepage = "https://itemdb.readthedocs.io";
+ maintainers = [ maintainers.matthiasbeyer ];
+ };
+}
+
+
diff --git a/pkgs/development/python-modules/itsdangerous/1.nix b/pkgs/development/python-modules/itsdangerous/1.nix
deleted file mode 100644
index d1669a1ed5bf..000000000000
--- a/pkgs/development/python-modules/itsdangerous/1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "itsdangerous";
- version = "1.1.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
- };
-
- meta = with lib; {
- description = "Helpers to pass trusted data to untrusted environments and back";
- homepage = "https://pypi.python.org/pypi/itsdangerous/";
- license = licenses.bsd0;
- };
-
-}
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index 574341f216ab..334907bb2ed9 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "jax";
- version = "0.2.26";
+ version = "0.2.27";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "${pname}-v${version}";
- sha256 = "155hhwgq6axdrj4x4hw72322qv1wc068n4cv4z2vf5jpl05fg93g";
+ sha256 = "0r1rs1zn0nzf8wpy6g5wrn2yrgi12gg2i7l285ka5d8wczjnbq47";
};
patches = [
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 9546225dabca..c44bfda13313 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.17.6";
+ version = "1.18.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JWipvhMsVI/AX7Pj4iHJh5GIgfwGLc7s1hZZJnsYGIw=";
+ sha256 = "0xzx32fnm39w916z8wm387ry480rbf7n9qppc18bjdv4jjwgf2rw";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index c498a69d0a62..8e8f0e4618a1 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jdatetime";
- version = "3.7.0";
+ version = "3.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f06876c926b8cf88b2f0f68d6cda2b0ff86002385877c9867970e1d017ef82a8";
+ sha256 = "389a0723a8011379a5e34386ec466cb3f65b2d5cb5422702c1d3aecb6ac192d0";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index 90e4634b46c9..4603b8708c4e 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "jedi-language-server";
- version = "0.34.11";
+ version = "0.35.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "pappasam";
repo = pname;
rev = "v${version}";
- sha256 = "0gxpq93mfyzhjz5yvjwv2jjda1djpf20x38893ngswsm7lrh62x5";
+ sha256 = "sha256-+bhvWWiG0cA36oc2PFvgRTIvqnjIt5BUN82DY0tvuPo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index ad94a3a3f7bc..d9884ab3d9f5 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "jedi";
- version = "0.18.0";
+ version = "0.18.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi";
rev = "v${version}";
- sha256 = "0d8zdj56hyxbsvvrid6r3nprm0ygxaad6zpsbhbj6k7p3dcx7acw";
+ sha256 = "sha256-wWNPNi16WtefvB7GcQBnWMbHVlVzxSFs4TKRqEasuR0=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 5613b904f63d..89b9ba1f6df0 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -17,6 +17,9 @@ buildPythonPackage rec {
};
postPatch = ''
+ # relax version constraint, https://storyboard.openstack.org/#!/story/2009723
+ substituteInPlace requirements.txt --replace 'PyYAML>=3.10.0,<6' 'PyYAML>=3.10.0'
+
export HOME=$TMPDIR
'';
diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix
deleted file mode 100644
index 02127a50df74..000000000000
--- a/pkgs/development/python-modules/jinja2/2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, pytest
-, markupsafe
-, setuptools
-}:
-
-buildPythonPackage rec {
- pname = "Jinja2";
- version = "2.11.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
- };
-
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ markupsafe setuptools ];
-
- # Multiple tests run out of stack space on 32bit systems with python2.
- # See https://github.com/pallets/jinja/issues/1158
- # warnings are no longer being filtered correctly for python2
- doCheck = !stdenv.is32bit && isPy3k;
-
- checkPhase = ''
- pytest -v tests -W ignore::DeprecationWarning
- '';
-
- meta = with lib; {
- homepage = "http://jinja.pocoo.org/";
- description = "Stand-alone template engine";
- license = licenses.bsd3;
- longDescription = ''
- Jinja2 is a template engine written in pure Python. It provides a
- Django inspired non-XML syntax but supports inline expressions and
- an optional sandboxed environment.
- '';
- maintainers = with maintainers; [ pierron sjourdois ];
- };
-}
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index f11fccb086bc..58759393bbed 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -1,17 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "jsmin";
- version = "2.2.2";
+ version = "3.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn";
+ sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc";
};
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "jsmin/test.py"
+ ];
+
+ pythonImportsCheck = [
+ "jsmin"
+ ];
+
meta = with lib; {
description = "JavaScript minifier";
homepage = "https://github.com/tikitu/jsmin/";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index f9452a25b7ab..aa70a35bd079 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "coveooss";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8=";
+ hash = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8=";
};
nativeBuildInputs = [
@@ -54,6 +54,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ # https://github.com/coveooss/json-schema-for-humans/issues/127
+ substituteInPlace pyproject.toml \
+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"'
+ '';
+
disabledTests = [
# Tests require network access
"test_references_url"
diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix
new file mode 100644
index 000000000000..9995e537c541
--- /dev/null
+++ b/pkgs/development/python-modules/json-tricks/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, pytestCheckHook
+, numpy
+, pandas
+, pytz
+}:
+
+buildPythonPackage rec {
+ pname = "json-tricks";
+ version = "3.15.5";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "mverleg";
+ repo = "pyjson_tricks";
+ rev = "v${version}";
+ sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU=";
+ };
+
+ checkInputs = [ numpy pandas pytz pytestCheckHook ];
+
+ pythonImportsCheck = [ "json_tricks" ];
+
+ meta = with lib; {
+ description = "Extra features for Python JSON handling";
+ homepage = "https://github.com/mverleg/pyjson_tricks";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix
index f6ea3fc610f1..f3fd7747ff86 100644
--- a/pkgs/development/python-modules/jupyter-packaging/default.nix
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "jupyter-packaging";
- version = "0.10.2";
+ version = "0.11.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "jupyter_packaging";
inherit version;
- sha256 = "sha256-iEX0ht1IwWYM+tGOUJHRwDVA6y6fvzzs8h7LIrabh3A=";
+ sha256 = "6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec";
};
propagatedBuildInputs = [ deprecation packaging tomlkit ];
diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
index c4589ce1b933..92b341a591c7 100644
--- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "jupyterlab-widgets";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchPypi {
pname = "jupyterlab_widgets";
inherit version;
- sha256 = "0y7vhhas3qndiypcpcfnhrj9n92v2w4hdc86nn620s9h9nl2j6jw";
+ sha256 = "7885092b2b96bf189c3a705cc3c412a4472ec5e8382d0b47219a66cccae73cfa";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 76b160eb97c3..88c3d39ccf0e 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -10,29 +10,41 @@
buildPythonPackage rec {
pname = "jupyterlab";
- version = "3.2.5";
- disabled = pythonOlder "3.5";
+ version = "3.2.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "31b28f473b0f5826d2020583973c385526f0559b5b26efac6b8035ac1562874a";
+ sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb";
};
- nativeBuildInputs = [ jupyter-packaging ];
+ nativeBuildInputs = [
+ jupyter-packaging
+ ];
- propagatedBuildInputs = [ jupyterlab_server notebook nbclassic ];
+ propagatedBuildInputs = [
+ jupyterlab_server
+ notebook
+ nbclassic
+ ];
makeWrapperArgs = [
- "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
+ "--set"
+ "JUPYTERLAB_DIR"
+ "$out/share/jupyter/lab"
];
# Depends on npm
doCheck = false;
- pythonImportsCheck = [ "jupyterlab" ];
+ pythonImportsCheck = [
+ "jupyterlab"
+ ];
meta = with lib; {
- description = "Jupyter lab environment notebook server extension.";
+ description = "Jupyter lab environment notebook server extension";
license = with licenses; [ bsd3 ];
homepage = "https://jupyter.org/";
maintainers = with maintainers; [ zimbatm costrouc ];
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index 7216421a86c7..ed0fe4bca2d7 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "jupyterlab_server";
- version = "2.10.2";
+ version = "2.10.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "bf1ec9e49d4e26f14d70055cc293b3f8ec8410f95a4d5b4bd55c442d9b8b266c";
+ sha256 = "3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a";
};
postPatch = ''
@@ -35,25 +35,10 @@ buildPythonPackage rec {
pytestCheckHook
pytest-tornasync
ruamel-yaml
- strict-rfc3339
];
pytestFlagsArray = [ "--pyargs" "jupyterlab_server" ];
- disabledTests = [
- # AttributeError: 'SpecPath' object has no attribute 'paths'
- "test_get_listing"
- "test_get_settings"
- "test_get_federated"
- "test_listing"
- "test_patch"
- "test_patch_unicode"
- "test_get_theme"
- "test_delete"
- "test_get_non_existant"
- "test_get"
- ];
-
__darwinAllowLocalNetworking = true;
meta = with lib; {
diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix
index c5f00393839e..309ecda49ccc 100644
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/pkgs/development/python-modules/kaptan/default.nix
@@ -16,6 +16,8 @@ buildPythonPackage rec {
postPatch = ''
sed -i "s/==.*//g" requirements/test.txt
+
+ substituteInPlace requirements/base.txt --replace 'PyYAML>=3.13,<6' 'PyYAML>=3.13'
'';
propagatedBuildInputs = [ pyyaml ];
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 68043f268ba5..71e9be548e5b 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "keyring";
- version = "23.4.0";
- disabled = pythonOlder "3.6";
+ version = "23.5.0";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-iPIGAkKV48b7FrsKYPtLt+wRhWKdxacp8SqnwjbQE4c=";
+ hash = "sha256-kBJQjhQagL0cC2d41cYQ3Z+MRk11rGd0JIUAUD+XL7k=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 319461b98344..bb39b29c0d51 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -1,27 +1,28 @@
{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
, amqp
-, vine
-, cached-property
-, importlib-metadata
, azure-servicebus
+, buildPythonPackage
+, cached-property
, case
+, fetchPypi
+, importlib-metadata
, Pyro4
, pytestCheckHook
+, pythonOlder
, pytz
+, vine
}:
buildPythonPackage rec {
pname = "kombu";
- version = "5.2.2";
+ version = "5.2.3";
+ format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608";
+ hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270=";
};
propagatedBuildInputs = [
@@ -40,9 +41,14 @@ buildPythonPackage rec {
pytz
];
+ pythonImportsCheck = [
+ "kombu"
+ ];
+
meta = with lib; {
description = "Messaging library for Python";
- homepage = "https://github.com/celery/kombu";
- license = licenses.bsd3;
+ homepage = "https://github.com/celery/kombu";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/labmath/default.nix b/pkgs/development/python-modules/labmath/default.nix
index 24018fd7420e..5eaeeba9a06d 100644
--- a/pkgs/development/python-modules/labmath/default.nix
+++ b/pkgs/development/python-modules/labmath/default.nix
@@ -2,17 +2,14 @@
buildPythonPackage rec {
pname = "labmath";
- version = "1.2.0";
+ version = "2.2.0";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/fZ61tJ6PVZsubr3OXlbg/VxyyKimz36uPV+r33kgD0=";
+ sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ=";
};
- postPatch = ''
- substituteInPlace setup.py --replace "labmath/DESCRIPTION.rst" "PKG-INFO"
- '';
-
pythonImportsCheck = [ "labmath" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix
index a9f2923bd073..a5fabd195db2 100644
--- a/pkgs/development/python-modules/launchpadlib/default.nix
+++ b/pkgs/development/python-modules/launchpadlib/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "launchpadlib";
- version = "1.10.15.1";
+ version = "1.10.16";
src = fetchPypi {
inherit pname version;
- sha256 = "4891f5b0c9bafbbb78aa06eeba1635629663c6aa80f621bcd1fc1057c8dd14b5";
+ sha256 = "0df4b13936f988afd0ee485f40fa6922eab783b48c38ca0108cb73c8788fca80";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index a485bf3a604b..2deb4f18d123 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -1,22 +1,22 @@
-{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
- unidecode, mock, pytest , backports-shutil-which, configargparse,
- python-daemon, pymsgbox }:
+{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic
+, unidecode, mock, pytest , backports-shutil-which, configargparse
+, python-daemon, pymsgbox, pynacl }:
# XXX: when changing this package, please test the package onlykey-agent.
buildPythonPackage rec {
pname = "libagent";
- version = "0.14.1";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "romanz";
repo = "trezor-agent";
rev = "v${version}";
- sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c";
+ sha256 = "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l";
};
propagatedBuildInputs = [ unidecode backports-shutil-which configargparse
- python-daemon pymsgbox ecdsa ed25519 mnemonic semver ];
+ python-daemon pymsgbox ecdsa ed25519 mnemonic semver pynacl ];
checkInputs = [ mock pytest ];
diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix
deleted file mode 100644
index 504e7753a978..000000000000
--- a/pkgs/development/python-modules/libcloud/2.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, mock
-, pycrypto
-, requests
-, pytest-runner
-, pytest
-, requests-mock
-, typing
-, backports_ssl_match_hostname
-}:
-
-buildPythonPackage rec {
- pname = "apache-libcloud";
- version = "2.8.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6";
- };
-
- checkInputs = [ mock pytest pytest-runner requests-mock ];
- propagatedBuildInputs = [ pycrypto requests ]
- ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ];
-
- preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
-
- # requires a certificates file
- doCheck = false;
-
- meta = with lib; {
- description = "A unified interface to many cloud providers";
- homepage = "https://libcloud.apache.org/";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index c2c0469aa819..a8e21a698f7f 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
- version = "7.9.0";
+ version = "7.10.0";
src = assert version == libvirt.version; fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
- sha256 = "sha256-cfCyQ3KTv0lYTZMriUhm6psBAcJJIcmR/M9V/lrLmVE=";
+ sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 7e241be4aafe..015417151b7a 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "lightgbm";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5b9f31759ab4e94d9409deb03104c55b0a40058a6ccea804022046d926bc4904";
+ sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 21217f34673f..1d496c2cf08d 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -7,15 +7,16 @@
buildPythonPackage rec {
pname = "limiter";
- version = "0.1.2";
+ version = "0.2.0";
+ format = "setuptools";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "alexdelorenzo";
repo = pname;
rev = "v${version}";
- sha256 = "0cdqw08qw3cid1yjknlh4hqfl46xh4madkjrl7sxk2c1pbwils8r";
+ hash = "sha256-h3XiCR/8rcCBwdhO6ExrrUE9piba5mssad3+t41scSk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index fc6982440d63..4c4f7a32133b 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "limits";
- version = "1.5.1";
+ version = "1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f0c3319f032c4bfad68438ed1325c0fac86dac64582c7c25cddc87a0b658fa20";
+ sha256 = "6c0a57b42647f1141f5a7a0a8479b49e4367c24937a01bd9d4063a595c2dd48a";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index 66a1a5f61f9e..ddf73ee56b86 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "liquidctl";
- version = "1.8.0";
+ version = "1.8.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-N0Ebd0zIHFmuiIozkAy4SV3o8rFA1wmrGd+dJo8jdk0=";
+ sha256 = "0cl1xg3rqpn4yjflwcz667pwfjnbq0g41pkg2nak7x9mxqnbdk70";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix
index 64766c232cdb..d25278a4e57c 100644
--- a/pkgs/development/python-modules/logfury/default.nix
+++ b/pkgs/development/python-modules/logfury/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, funcsigs
, setuptools-scm
, pytestCheckHook
, pythonOlder
@@ -11,22 +10,19 @@
buildPythonPackage rec {
pname = "logfury";
version = "1.0.1";
+ format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY=";
+ hash = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY=";
};
nativeBuildInputs = [
setuptools-scm
];
- propagatedBuildInputs = [
- funcsigs
- ];
-
checkInputs = [
pytestCheckHook
testfixtures
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 3134d956af78..3c5bff1382b9 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -1,42 +1,68 @@
{ lib
, stdenv
+, aiocontextvars
, buildPythonPackage
-, fetchPypi
-, fetchpatch
-, isPy27
, colorama
+, fetchpatch
+, fetchPypi
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "loguru";
version = "0.5.3";
+ format = "setuptools";
- disabled = isPy27;
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319";
};
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
+ aiocontextvars
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ colorama
+ ];
+
patches = [
# Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3
(fetchpatch {
url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch";
sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67";
})
- # fix tests with Python 3.9
+ # Fix tests with Python 3.9
(fetchpatch {
url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch";
sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6";
})
];
- checkInputs = [ pytestCheckHook colorama ];
+ disabledTestPaths = lib.optionals stdenv.isDarwin [
+ "tests/test_multiprocessing.py"
+ ];
+
+ disabledTests = [
+ "test_time_rotation_reopening"
+ "test_file_buffering"
+ # Tests are failing with Python 3.10
+ "test_exception_others"
+ ""
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_rotation_and_retention"
+ "test_rotation_and_retention_timed_file"
+ "test_renaming"
+ "test_await_complete_inheritance"
+ ];
- disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ];
- disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
- ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
+ pythonImportsCheck = [
+ "loguru"
+ ];
meta = with lib; {
homepage = "https://github.com/Delgan/loguru";
diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix
deleted file mode 100644
index 9c719d234f89..000000000000
--- a/pkgs/development/python-modules/lpod/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, lxml
-, docutils
-, pillow
-, isPy3k
-}:
-
-buildPythonPackage {
- version = "1.1.7";
- pname = "python-lpod";
- # lpod library currently does not support Python 3.x
- disabled = isPy3k;
-
- propagatedBuildInputs = [ lxml docutils pillow ];
-
- src = fetchFromGitHub {
- owner = "lpod";
- repo = "lpod-python";
- rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
- sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
- };
-
- meta = with lib; {
- homepage = "https://github.com/lpod/lpod-python/";
- description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index c8ca8254b363..e14db125fba5 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "luftdaten";
- version = "0.7.1";
+ version = "0.7.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-luftdaten";
rev = version;
- sha256 = "sha256-76Y5TJet0WtzYXuK8Og0rmpsUIlXK7b37oesh+MliU8=";
+ sha256 = "sha256-tYaY/F4mdO5k+Oj+RkNFWP8xqh1xuDyoAKBFzAhamkA=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix
index 9aab07b01665..7df8532a4e2a 100644
--- a/pkgs/development/python-modules/luxtronik/default.nix
+++ b/pkgs/development/python-modules/luxtronik/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "luxtronik";
- version = "0.3.9";
+ version = "0.3.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Bouni";
repo = "python-luxtronik";
rev = version;
- sha256 = "mScdTQ82tV5fyy1S0YDDOz1UC4VB0OmSXD5gHp53WsE=";
+ sha256 = "sha256-JPY1HbNZanEsUpQ5W2kAwEFvwNGQI2hoogTZUGIg3YY=";
};
# Project has no tests
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 60deaa5af127..2c549b6830a1 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "lxml";
- version = "4.6.4-5";
+ version = "4.7.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "lxml-${version}";
- sha256 = "159cc48nl40qsx8pc8sasgny5xc0s3y0xrq3w3aw53s3ijncsgfl";
+ sha256 = "0xji4kcw1fl3nqg04q6zlympkx2kv2s1r1p18763dshgpisqgiq4";
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
new file mode 100644
index 000000000000..83485f4252b8
--- /dev/null
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "mailchecker";
+ version = "4.1.9";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-vr70AB8EiOmb8lgwrq78iTnHdrp14Ppyh57Trh8SQ8Q=";
+ };
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "MailChecker"
+ ];
+
+ meta = with lib; {
+ description = "Module for temporary (disposable/throwaway) email detection";
+ homepage = "https://github.com/FGRibreau/mailchecker";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix
index dbf4b8ffe46b..1d4ae635800c 100644
--- a/pkgs/development/python-modules/makefun/default.nix
+++ b/pkgs/development/python-modules/makefun/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "makefun";
- version = "1.13.0";
+ version = "1.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2c673d2b4f0ef809347513cb45e3b23a04228588af7c9ac859e99247abac516a";
+ sha256 = "985bb8b670ffbbb95d2a8aa996d318e6e9a3f26fc6f3ef2da93ebdf8f9c616bf";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix
deleted file mode 100644
index 93a4ccb959f7..000000000000
--- a/pkgs/development/python-modules/marisa/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "marisa";
- version = "1.3.40";
-
- disabled = isPy3k;
-
- src = fetchFromGitHub {
- owner = "s-yata";
- repo = "marisa-trie";
- rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b";
- sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933";
- };
-
- nativeBuildInputs = [ swig marisa ];
- buildInputs = [ marisa ];
-
- sourceRoot = "${src.name}/bindings/python";
-
- meta = with lib; {
- description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)";
- homepage = "https://github.com/s-yata/marisa-trie";
- license = with licenses; [ bsd2 lgpl2 ];
- maintainers = with maintainers; [ vanzef ];
- };
-}
diff --git a/pkgs/development/python-modules/markdown/3_1.nix b/pkgs/development/python-modules/markdown/3_1.nix
deleted file mode 100644
index 13ed2f1744a2..000000000000
--- a/pkgs/development/python-modules/markdown/3_1.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools
-, nose
-, pyyaml
-, pythonOlder
-, importlib-metadata
-}:
-
-buildPythonPackage rec {
- pname = "Markdown";
- version = "3.1.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
- };
-
- propagatedBuildInputs = [
- setuptools
- ] ++ lib.optionals (pythonOlder "3.8") [
- importlib-metadata
- ];
-
- checkInputs = [ nose pyyaml ];
-
- meta = {
- description = "A Python implementation of John Gruber's Markdown with Extension support";
- homepage = "https://github.com/Python-Markdown/markdown";
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix
index 83a4f224f2fb..2c91e46d13d1 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "markdown";
- version = "3.3.5";
+ version = "3.3.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Markdown";
inherit version;
- sha256 = "sha256-JulUa/vN5fzQcr2PYSycG24md8uKrb32UgZnT0bd4Gk=";
+ sha256 = "sha256-dt+K4yKU7Dnc+JNAOCiC36Epdfh/RcPtHs2x6M78cAY=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
diff --git a/pkgs/development/python-modules/markupsafe/1.nix b/pkgs/development/python-modules/markupsafe/1.nix
deleted file mode 100644
index ae0878c7a972..000000000000
--- a/pkgs/development/python-modules/markupsafe/1.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- pname = "MarkupSafe";
- version = "1.1.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b";
- };
-
- meta = with lib; {
- description = "Implements a XML/HTML/XHTML Markup safe string";
- homepage = "http://dev.pocoo.org";
- license = licenses.bsd3;
- maintainers = with maintainers; [ domenkozar ];
- };
-
-}
diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
index 145005fd5e39..4b36ee9b74ef 100644
--- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix
+++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
@@ -4,6 +4,7 @@
, marshmallow
, marshmallow-enum
, pytestCheckHook
+, pythonAtLeast
, pythonOlder
, typeguard
, typing-inspect
@@ -34,7 +35,20 @@ buildPythonPackage rec {
typeguard
];
- pythonImportsCheck = [ "marshmallow_dataclass" ];
+ pytestFlagsArray = [
+ # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12.
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # TypeError: UserId is not a dataclass and cannot be turned into one.
+ "test_newtype"
+ ];
+
+ pythonImportsCheck = [
+ "marshmallow_dataclass"
+ ];
meta = with lib; {
description = "Automatic generation of marshmallow schemas from dataclasses";
diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix
new file mode 100644
index 000000000000..44d37b988a7d
--- /dev/null
+++ b/pkgs/development/python-modules/matrix-common/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, attrs
+}:
+
+buildPythonPackage rec {
+ pname = "matrix_common";
+ version = "1.0.0";
+ format = "pyproject";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4=";
+ };
+
+ propagatedBuildInputs = [ attrs ];
+ pythonImportsCheck = [ "matrix_common" ];
+
+ meta = with lib; {
+ description = "Common utilities for Synapse, Sydent and Sygnal";
+ homepage = "https://github.com/matrix-org/matrix-python-common";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ sumnerevans ];
+ };
+}
diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix
index 6a0be0696063..2564670c8b99 100644
--- a/pkgs/development/python-modules/mattermostdriver/default.nix
+++ b/pkgs/development/python-modules/mattermostdriver/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "mattermostdriver";
- version = "7.3.1";
+ version = "7.3.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea";
+ sha256 = "2e4d7b4a17d3013e279c6f993746ea18cd60b45d8fa3be24f47bc2de22b9b3b4";
};
propagatedBuildInputs = [ websockets requests ];
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 4e4e6dcc6345..dcdc946e21d6 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.14.3";
+ version = "0.14.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701";
+ sha256 = "sha256-dh3uQUBEMqtlrOpnO5Aa7GC5gajwQ12rWyVPwX6xIsQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index 6f13e63b9341..7ffbbf888f34 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -1,16 +1,27 @@
-{ lib, buildPythonPackage, pythonOlder, fetchPypi, wrapQtAppsHook
-, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5
+{ lib
+, apptools
+, buildPythonPackage
+, envisage
+, fetchPypi
+, numpy
+, pyface
+, pygments
+, pyqt5
+, pythonOlder
+, traitsui
+, vtk
+, wrapQtAppsHook
}:
buildPythonPackage rec {
pname = "mayavi";
version = "4.7.4";
+ format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- extension = "tar.gz";
sha256 = "ec50e7ec6afb0f9224ad1863d104a0d1ded6c8deb13e720652007aaca2303332";
};
@@ -24,14 +35,27 @@ buildPythonPackage rec {
--replace "build.build.run(self)" "build.build.run(self); return"
'';
- nativeBuildInputs = [ wrapQtAppsHook ];
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ ];
propagatedBuildInputs = [
- pyface pygments numpy vtk traitsui envisage apptools pyqt5
+ apptools
+ envisage
+ numpy
+ pyface
+ pygments
+ pyqt5
+ traitsui
+ vtk
];
- doCheck = false; # Needs X server
- pythonImportsCheck = [ "mayavi" ];
+ # Needs X server
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "mayavi"
+ ];
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
@@ -40,7 +64,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "3D visualization of scientific data in Python";
homepage = "https://github.com/enthought/mayavi";
- maintainers = with maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ knedlsepp ];
};
}
diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix
index 02aafd3302a9..1ab425ade551 100644
--- a/pkgs/development/python-modules/mdformat/default.nix
+++ b/pkgs/development/python-modules/mdformat/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "mdformat";
- version = "0.7.11";
+ version = "0.7.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "executablebooks";
repo = pname;
rev = version;
- sha256 = "sha256-EhMoGSCtlEcm1+1aHn9DhBnLQvolhq62SMF/AdaY1/E=";
+ sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index a0aacb63a1cf..6bc9635a66aa 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
- version = "0.4.4.1";
+ version = "0.4.4.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = version;
- sha256 = "sha256-NkLMQ1sgoZit2BQechgGq8XhBuzw2P7jKHsAjGq3l08=";
+ sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 95e1a3e3316a..d50bdc4d461b 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.2.52";
+ version = "1.2.58";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU=";
+ sha256 = "sha256-USUqVzVfkp9X4zRl4D6gGDkJ/tRG3sN36MqcmJebwL4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix
index b07f68401e25..f94ddb12ac5d 100644
--- a/pkgs/development/python-modules/metakernel/default.nix
+++ b/pkgs/development/python-modules/metakernel/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "metakernel";
- version = "0.28.1";
+ version = "0.28.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3b57eb7b3b332614dcba1fa53c8cc1253dbccf962b111517ea16cbecce9a11d5";
+ sha256 = "8811a4497444495639ef000902f4c6e8a7e2c57da1d47a8a24bcc9083548b389";
};
propagatedBuildInputs = [ ipykernel ];
diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix
index 8fdc7910fe83..07db8906c5d3 100644
--- a/pkgs/development/python-modules/micloud/default.nix
+++ b/pkgs/development/python-modules/micloud/default.nix
@@ -2,23 +2,25 @@
, buildPythonPackage
, fetchFromGitHub
, click
+, pycryptodome
, requests
, tzlocal
}:
buildPythonPackage rec {
pname = "micloud";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "Squachen";
repo = "micloud";
rev = "v_${version}";
- sha256 = "01z1qfln6f7pnxb4ssmyygyamnfgh36fzgn85s8axdwy8wrch20x";
+ sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ=";
};
propagatedBuildInputs = [
click
+ pycryptodome
requests
tzlocal
];
diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix
new file mode 100644
index 000000000000..0417fe7594fd
--- /dev/null
+++ b/pkgs/development/python-modules/minexr/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, numpy
+, pillow
+}:
+
+buildPythonPackage rec {
+ pname = "minexr";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "cheind";
+ repo = "py-minexr";
+ rev = "v${version}";
+ sha256 = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M=";
+ };
+
+ propagatedBuildInputs = [ numpy ];
+
+ pythonImportsCheck = [ "minexr" ];
+ checkInputs = [ pytestCheckHook pillow ];
+
+ meta = with lib; {
+ description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files.";
+ homepage = "https://github.com/cheind/py-minexr";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 789d68c7f93e..d99bdec4b0da 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -1,23 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pythonOlder
}:
buildPythonPackage rec {
pname = "mitogen";
- version = "0.3.0";
+ version = "0.3.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mitogen-hq";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SotxlsJDIeFd4BN9C7afyyybET5ST2yaoWVEyT/lr48=";
+ sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg=";
};
# Tests require network access and Docker support
doCheck = false;
- pythonImportsCheck = [ "mitogen" ];
+ pythonImportsCheck = [
+ "mitogen"
+ ];
meta = with lib; {
description = "Python Library for writing distributed self-replicating programs";
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 255c9039ae97..658470ec72b8 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
, alembic
, click
, cloudpickle
@@ -20,16 +20,18 @@
, sqlalchemy
, gorilla
, gunicorn
+, prometheus-flask-exporter
+, importlib-metadata
}:
buildPythonPackage rec {
pname = "mlflow";
- version = "1.21.0";
+ version = "1.22.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "5524a371f19c66a18e7ebe9b1085a77f63a6ae514271e487428f28187d79fc8f";
+ sha256 = "f680390715e436ae38cf7056ec91030fc9eb67cc631226f28ff9504fbe395add";
};
# run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
@@ -58,6 +60,17 @@ buildPythonPackage rec {
sqlalchemy
gorilla
gunicorn
+ prometheus-flask-exporter
+ importlib-metadata
+ ];
+
+ patches = [
+ # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245
+ (fetchpatch {
+ name = "relax-alembic-version.patch";
+ url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch";
+ sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0=";
+ })
];
meta = with lib; {
@@ -65,7 +78,5 @@ buildPythonPackage rec {
description = "Open source platform for the machine learning lifecycle";
license = licenses.asl20;
maintainers = with maintainers; [ tbenst ];
- # missing prometheus-flask-exporter, not packaged in nixpkgs
- broken = true; # 2020-08-15
};
}
diff --git a/pkgs/development/python-modules/mock/2.nix b/pkgs/development/python-modules/mock/2.nix
deleted file mode 100644
index 190297b41a2d..000000000000
--- a/pkgs/development/python-modules/mock/2.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, funcsigs
-, six
-, pbr
-, python
-, pytest
-}:
-
-buildPythonPackage rec {
- pname = "mock";
- version = "3.0.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3";
- };
-
- propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ];
-
- # On PyPy for Python 2.7 in particular, Mock's tests have a known failure.
- # Mock upstream has a decoration to disable the failing test and make
- # everything pass, but it is not yet released. The commit:
- # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12
- #doCheck = !(python.isPyPy && python.isPy27);
- doCheck = false; # Infinite recursion pytest
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- checkInputs = [
- pytest
- ];
-
- meta = with lib; {
- description = "Mock objects for Python";
- homepage = "http://python-mock.sourceforge.net/";
- license = licenses.bsd2;
- };
-
-}
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 9d6c64da2153..afef1cb5724d 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -19,12 +19,12 @@
buildPythonPackage rec {
pname = "mocket";
- version = "3.10.2";
+ version = "3.10.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bb/Uf9xWKRNr27SHzTzI14a0At9Ua5xxBr7XN2d6qfQ=";
+ sha256 = "82634f7d1a39f6a340ff9c7486e37bf3698e6510fdcfa7b378b5fbb256a42cda";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix
new file mode 100644
index 000000000000..0f2f305c97c3
--- /dev/null
+++ b/pkgs/development/python-modules/mongomock/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, sentinels
+, six
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "mongomock";
+ version = "3.23.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ sentinels
+ six
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "mongomock" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mongomock/mongomock";
+ description = "Fake pymongo stub for testing simple MongoDB-dependent code";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix
deleted file mode 100644
index f9a6ac732e2e..000000000000
--- a/pkgs/development/python-modules/more-itertools/2.7.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, six
-, stdenv
-}:
-
-
-buildPythonPackage rec {
- pname = "more-itertools";
- version = "5.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4";
- };
-
- checkInputs = [ nose ];
- propagatedBuildInputs = [ six ];
-
- # iterable = range(10 ** 10) # Is efficiently reversible
- # OverflowError: Python int too large to convert to C long
- doCheck = !stdenv.hostPlatform.is32bit;
-
- meta = {
- homepage = "https://more-itertools.readthedocs.org";
- description = "Expansion of the itertools module";
- license = lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index a8fb0ae58dd4..6e9946cce16b 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
- version = "0.5.8.2";
+ version = "0.5.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = version;
- sha256 = "6aSwUuH5IpfcuVGXWVmb0DHglsUtGh/ATOe6iih6fXk=";
+ sha256 = "0zz5ardnik370pdfpl77m0hln8rj7ikkvrkyc6fm0vd0w12sihmm";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix
index a673d96893fa..f81395f0245b 100644
--- a/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/pkgs/development/python-modules/msal-extensions/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "msal-extensions";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm";
+ sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
index 4f3dbc60d18a..a1d834929055 100644
--- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix
+++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "msoffcrypto-tool";
- version = "4.12.0";
+ version = "5.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "nolze";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EBEwldh2Ct/4oxnAF1hWeW/uRrVsCYEi0cJaZubofFk=";
+ sha256 = "sha256-A5A578JZrxRXX6ewkFzittGTOebeNb99fuKsEm5QGoI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mutagen/1.43.nix b/pkgs/development/python-modules/mutagen/1.43.nix
deleted file mode 100644
index 7f2e9f452b4d..000000000000
--- a/pkgs/development/python-modules/mutagen/1.43.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, hypothesis
-, pycodestyle
-, pyflakes
-, pytest
-, setuptools
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "mutagen";
- version = "1.43.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9";
- };
-
- propagatedBuildInputs = [ setuptools ];
- checkInputs = [
- pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
- pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis
- ];
- LC_ALL = "en_US.UTF-8";
-
- meta = with lib; {
- description = "Python multimedia tagging library";
- homepage = "https://mutagen.readthedocs.io";
- license = licenses.lgpl2Plus;
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/development/python-modules/mutmut/default.nix b/pkgs/development/python-modules/mutmut/default.nix
new file mode 100644
index 000000000000..ae0f06213a87
--- /dev/null
+++ b/pkgs/development/python-modules/mutmut/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitHub
+, buildPythonApplication
+, click
+, glob2
+, parso
+, pony
+, junit-xml
+, pythonOlder
+, testVersion
+}:
+
+let self = buildPythonApplication rec {
+ pname = "mutmut";
+ version = "2.2.0";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = "boxed";
+ rev = version;
+ hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY=";
+ };
+
+ postPatch = ''
+ substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9'
+ '';
+
+ disabled = pythonOlder "3.7";
+
+ doCheck = false;
+
+ propagatedBuildInputs = [ click glob2 parso pony junit-xml ];
+
+ passthru.tests.version = testVersion { package = self; };
+
+ meta = with lib; {
+ description = "mutation testing system for Python, with a strong focus on ease of use";
+ homepage = "https://github.com/boxed/mutmut";
+ changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ synthetica ];
+ };
+};
+in self
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 3c9d625db70f..33ff7f4371c9 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "natsort";
- version = "7.2.0";
+ version = "8.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "e7054b4e1f47365f141602a742685165a552291b643a214652d0dd9d6cea58d1";
+ hash = "sha256-/rh+DOHcH48/IeGKhSFseQ50bXal/2iJVjOUYF9QSis=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index 1b0a95f3d76f..38234c1486e1 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "nbsphinx";
- version = "0.8.7";
+ version = "0.8.8";
src = fetchPypi {
inherit pname version;
- sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c";
+ sha256 = "b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 010e2a5bae3f..2cb040ed8a38 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -21,7 +21,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
paramiko
lxml
- selectors2
];
checkInputs = [
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 33c37d5e9807..384b6db360b9 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "1.5.1";
+ version = "1.5.4";
pname = "nest_asyncio";
disabled = !(pythonAtLeast "3.5");
src = fetchPypi {
inherit pname version;
- sha256 = "afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa";
+ sha256 = "f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd";
};
# tests not packaged with source dist as of 1.3.2/1.3.2, and
diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix
index c54719b696b1..e3071ea437d3 100644
--- a/pkgs/development/python-modules/netdata/default.nix
+++ b/pkgs/development/python-modules/netdata/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "netdata";
- version = "1.0.1";
+ version = "1.0.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-netdata";
rev = version;
- sha256 = "sha256-4+cTIqytHrCPG7lUZv1IhL7Bk5GlTEveQTtuCkFIepo=";
+ sha256 = "sha256-D0W+zOpD2+iynhHMZh4obUSJJKmP3DnzA7blNWi6eHk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index 5bb8b15f6834..79c48e57f2b0 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -9,14 +9,16 @@
buildPythonPackage rec {
pname = "nexia";
- version = "0.9.12";
+ version = "0.9.13";
+ format = "setuptools";
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
- sha256 = "sha256-YZHAWRTYquUm3Ymi/3mSQqxYZuoxsH5Q/LZOPDftEzU=";
+ sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0=";
};
propagatedBuildInputs = [
@@ -29,10 +31,13 @@ buildPythonPackage rec {
];
postPatch = ''
- substituteInPlace setup.py --replace '"pytest-runner",' ""
+ substituteInPlace setup.py \
+ --replace '"pytest-runner",' ""
'';
- pythonImportsCheck = [ "nexia" ];
+ pythonImportsCheck = [
+ "nexia"
+ ];
meta = with lib; {
description = "Python module for Nexia thermostats";
diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index 9d916cc9324d..60c9f271011c 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -7,6 +7,7 @@
, pykka
, enum34
, pythonOlder
+, pythonAtLeast
}:
# Note we currently do not patch the path to the drivers
@@ -17,6 +18,9 @@ buildPythonPackage rec {
pname = "nidaqmx";
version = src.rev;
+ # 3.10 is not supported, upstream inactive
+ disabled = pythonAtLeast "3.10";
+
src = fetchFromGitHub {
owner = "ni";
repo = "nidaqmx-python";
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index 2567e70b0d67..2f3b69b53c05 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -1,25 +1,32 @@
{ lib
, appdirs
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "nmapthon2";
- version = "0.1.2";
+ version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.8";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-6mGMB8nW6CqTPxgc1fveh6fJo/t+jpUS6rJ2VR2gU/g=";
+ src = fetchFromGitHub {
+ owner = "cblopez";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-t4gAcDwHHejfipQmJvMLhKmdz8D6UN/Mmsrhpq0cygY=";
};
- # Tests are not part of the PyPI source and source is not tagged
- # https://github.com/cblopez/nmapthon2/issues/3
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "tests/scanner_tests.py"
+ ];
pythonImportsCheck = [
"nmapthon2"
diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
deleted file mode 100644
index 209d1f090779..000000000000
--- a/pkgs/development/python-modules/nmigen-boards/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, nmigen
-, setuptools
-, setuptools-scm
-}:
-
-buildPythonPackage rec {
- pname = "nmigen-boards";
- version = "unstable-2021-02-09";
- # python setup.py --version
- realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}";
-
- src = fetchFromGitHub {
- owner = "nmigen";
- repo = "nmigen-boards";
- rev = "a35d870a994c2919116b2c06166dc127febb1512";
- sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ setuptools nmigen ];
-
- preBuild = ''
- export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
- '';
-
- # no tests
- doCheck = false;
-
- meta = with lib; {
- description = "Board and connector definitions for nMigen";
- homepage = "https://github.com/nmigen/nmigen-boards";
- license = licenses.bsd2;
- maintainers = with maintainers; [ emily ];
- };
-}
diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix
deleted file mode 100644
index 22422adad92a..000000000000
--- a/pkgs/development/python-modules/nmigen-soc/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, nmigen
-, setuptools
-, setuptools-scm
-}:
-
-buildPythonPackage rec {
- pname = "nmigen-soc";
- version = "unstable-2021-02-09";
- # python setup.py --version
- realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}";
-
- src = fetchFromGitHub {
- owner = "nmigen";
- repo = "nmigen-soc";
- rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd";
- sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ setuptools nmigen ];
-
- preBuild = ''
- export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
- '';
-
- meta = with lib; {
- description = "System on Chip toolkit for nMigen";
- homepage = "https://github.com/nmigen/nmigen-soc";
- license = licenses.bsd2;
- maintainers = with maintainers; [ emily ];
- };
-}
diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix
deleted file mode 100644
index bd195b52d44e..000000000000
--- a/pkgs/development/python-modules/notmuch/2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-
-, buildPythonPackage
-, notmuch
-, python
-, cffi
-}:
-
-buildPythonPackage {
- pname = "notmuch2";
- inherit (notmuch) version src;
-
- sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi";
-
- buildInputs = [ python notmuch cffi ];
-
- # no tests
- doCheck = false;
- pythonImportsCheck = [ "notmuch2" ];
-
- meta = with lib; {
- description = "Pythonic bindings for the notmuch mail database using CFFI";
- homepage = "https://notmuchmail.org/";
- license = licenses.gpl3;
- maintainers = with maintainers; [ teto ];
- };
-}
diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix
deleted file mode 100644
index 1ab958a15f07..000000000000
--- a/pkgs/development/python-modules/numpy/1.16.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ lib
-, fetchPypi
-, python
-, buildPythonPackage
-, gfortran
-, pytest
-, blas
-, lapack
-, writeTextFile
-, isPyPy
-, cython
-, setuptoolsBuildHook
- }:
-
-assert (!blas.isILP64) && (!lapack.isILP64);
-
-let
- cfg = writeTextFile {
- name = "site.cfg";
- text = (lib.generators.toINI {} {
- ${blas.implementation} = {
- include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
- library_dirs = "${blas}/lib:${lapack}/lib";
- runtime_library_dirs = "${blas}/lib:${lapack}/lib";
- libraries = "lapack,lapacke,blas,cblas";
- };
- lapack = {
- include_dirs = "${lib.getDev lapack}/include";
- library_dirs = "${lapack}/lib";
- runtime_library_dirs = "${lapack}/lib";
- };
- blas = {
- include_dirs = "${lib.getDev blas}/include";
- library_dirs = "${blas}/lib";
- runtime_library_dirs = "${blas}/lib";
- };
- });
- };
-in buildPythonPackage rec {
- pname = "numpy";
- version = "1.16.6";
- format = "pyproject.toml";
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff";
- };
-
- nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
- buildInputs = [ blas lapack ];
-
- patches = lib.optionals python.hasDistutilsCxxPatch [
- # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
- # Patching of numpy.distutils is needed to prevent it from undoing the
- # patch to distutils.
- ./numpy-distutils-C++_1.16.patch
- ];
-
- preConfigure = ''
- sed -i 's/-faltivec//' numpy/distutils/system_info.py
- export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
- export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
- '';
-
- preBuild = ''
- ln -s ${cfg} site.cfg
- '';
-
- enableParallelBuilding = true;
-
- doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
-
- checkPhase = ''
- runHook preCheck
- pushd dist
- ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)'
- popd
- runHook postCheck
- '';
-
- passthru = {
- # just for backwards compatibility
- blas = blas.provider;
- blasImplementation = blas.implementation;
- inherit cfg;
- };
-
- # Disable test
- # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
- NOSE_EXCLUDE="test_large_file_support";
-
- meta = {
- description = "Scientific tools for Python";
- homepage = "https://numpy.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ fridh ];
- };
-}
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch
deleted file mode 100644
index b2626ea26e5b..000000000000
--- a/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
---- a/numpy/distutils/unixccompiler.py
-+++ b/numpy/distutils/unixccompiler.py
-@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
- if opt not in llink_s:
- self.linker_so = llink_s.split() + opt.split()
-
-- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
--
- # gcc style automatic dependencies, outputs a makefile (-MF) that lists
- # all headers needed by a c file as a side effect of compilation (-MMD)
- if getattr(self, '_auto_depends', False):
-@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
- deps = []
-
- try:
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
-- extra_postargs, display = display)
-+ if self.detect_language(src) == 'c++':
-+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps +
-+ extra_postargs, display = display)
-+ else:
-+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
-+ extra_postargs, display = display)
-+
- except DistutilsExecError:
- msg = str(get_exception())
- raise CompileError(msg)
diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 793e23d71135..2278133582c6 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -1,45 +1,58 @@
{ lib
-, fetchFromGitHub
, buildPythonPackage
, certifi
+, circuitbreaker
, configparser
, cryptography
+, fetchFromGitHub
, pyopenssl
, python-dateutil
+, pythonOlder
, pytz
}:
buildPythonPackage rec {
pname = "oci";
- version = "2.36.0";
+ version = "2.53.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-python-sdk";
rev = "v${version}";
- hash = "sha256-scG/ZhWeiCgXp7iD6arWIN8KZecSjKLsCW4oXeJvx6M=";
+ hash = "sha256-TnLKT/F36jHEfT9K6DFM2GmPRccXz1GJWIF+EEQYRls=";
};
+ propagatedBuildInputs = [
+ certifi
+ circuitbreaker
+ configparser
+ cryptography
+ pyopenssl
+ python-dateutil
+ pytz
+ ];
+
postPatch = ''
substituteInPlace setup.py \
- --replace "configparser==4.0.2" "configparser" \
- --replace "cryptography==3.2.1" "cryptography" \
+ --replace "configparser==4.0.2 ; python_version < '3'" "configparser" \
+ --replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \
--replace "pyOpenSSL>=17.5.0,<=19.1.0" "pyOpenSSL"
'';
- propagatedBuildInputs = [
- certifi configparser cryptography pyopenssl python-dateutil pytz
- ];
-
# Tests fail: https://github.com/oracle/oci-python-sdk/issues/164
doCheck = false;
- pythonImportsCheck = [ "oci" ];
+ pythonImportsCheck = [
+ "oci"
+ ];
meta = with lib; {
description = "Oracle Cloud Infrastructure Python SDK";
- homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/en/latest/index.html";
+ homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/";
+ license = with licenses; [ asl20 /* or */ upl ];
maintainers = with maintainers; [ ilian ];
- license = with licenses; [ asl20 upl ];
};
}
diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix
index aa275cb27a69..698795c75bae 100644
--- a/pkgs/development/python-modules/od/default.nix
+++ b/pkgs/development/python-modules/od/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, unittest2, repeated_test }:
+{ lib, buildPythonPackage, fetchPypi, unittest2 }:
buildPythonPackage rec {
pname = "od";
@@ -9,8 +9,10 @@ buildPythonPackage rec {
sha256 = "1az30snc3w6s4k1pi7mspcv8y0kp3ihf3ly44z517nszmz9lrjfi";
};
+ # repeated_test no longer exists in nixpkgs
+ # also see: https://github.com/epsy/od/issues/1
+ doCheck = false;
checkInputs = [
- repeated_test
unittest2
];
diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix
index d2c39e54ef48..ff0dc7c1c93a 100644
--- a/pkgs/development/python-modules/olefile/default.nix
+++ b/pkgs/development/python-modules/olefile/default.nix
@@ -1,7 +1,13 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
buildPythonPackage rec {
pname = "olefile";
version = "0.46";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -9,10 +15,20 @@ buildPythonPackage rec {
sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964";
};
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "olefile"
+ ];
+
meta = with lib; {
description = "Python package to parse, read and write Microsoft OLE2 files";
homepage = "https://www.decalage.info/python/olefileio";
- # BSD like + reference to Pillow
- license = "http://olefile.readthedocs.io/en/latest/License.html";
+ # BSD2 + reference to Pillow
+ # http://olefile.readthedocs.io/en/latest/License.html
+ license = with licenses; [ bsd2 /* and */ hpnd ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 542112126b10..223cf80604c4 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "openai";
- version = "0.11.5";
+ version = "0.12.0";
disabled = pythonOlder "3.7.1";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
- sha256 = "sha256-6eL3/vDWyIOVjRQo4OO3OgyUG3t8dKPtxzMMTxPCglM=";
+ sha256 = "12qkbaw1gyqhs6qwyj65g6l8v5xxnilwgk0gxlwnlzrr82q458ia";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 8e39c899684c..0d48ab04a1db 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -66,6 +66,8 @@ buildPythonPackage rec {
disabledTests = [
# TypeError: Unexpected keyword arguments passed to pytest.raises: message
"test_string_format_invalid_value"
+ # Needs a fix for new PyYAML
+ "test_django_rest_framework_apiview"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
index 9bb807784ca7..976088baad76 100644
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "openstacksdk";
- version = "0.60.0";
+ version = "0.61.0";
src = fetchPypi {
inherit pname version;
- sha256 = "aa6efead2ac116482f29aecc2c14ba3b4c76a6f8dede93bf296a2b65492ef420";
+ sha256 = "3eed308871230f0c53a8f58b6c5a358b184080c6b2c6bc69ab088eea057aa127";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix
index 2ded1dfc1961..6e4eabeb68ab 100644
--- a/pkgs/development/python-modules/opt-einsum/default.nix
+++ b/pkgs/development/python-modules/opt-einsum/default.nix
@@ -1,24 +1,38 @@
-{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
version = "3.3.0";
- pname = "opt_einsum";
+ pname = "opt-einsum";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit version pname;
- sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr";
+ pname = "opt_einsum";
+ inherit version;
+ hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk=";
};
- propagatedBuildInputs = [ numpy ];
+ propagatedBuildInputs = [
+ numpy
+ ];
- checkInputs = [ pytest_4 ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- pytest
- '';
+ pythonImportsCheck = [
+ "opt_einsum"
+ ];
meta = with lib; {
- description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
+ description = "Optimizing NumPy's einsum function with order optimization and GPU support";
homepage = "https://github.com/dgasmith/opt_einsum";
license = licenses.mit;
maintainers = with maintainers; [ teh ];
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 4a579d8766bf..98fc412869de 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -15,20 +15,20 @@
buildPythonPackage rec {
pname = "orjson";
- version = "3.6.4";
+ version = "3.6.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ijl";
repo = pname;
rev = version;
- sha256 = "0xpna70s5v7d4lwsb6ijc0f2rm6p7jqmac9yayx9qb1dasbki6zd";
+ sha256 = "00s8pwvq830h2y77pwx1i2vfvnzisvp41qhzqcp1piyc3pwxfc13";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "0m4f8lc0zwxh4lmxkpxvdd2lc2g3lkq0ymllqbyr31sbxvwnxk56";
+ sha256 = "0l1zvkr06kwclgxy1qz9fxa1gjrpf5nnx6hb12j4ymyyxpcmn8rz";
};
format = "pyproject";
diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix
index f2dd196be942..a1d738890b30 100644
--- a/pkgs/development/python-modules/orm/default.nix
+++ b/pkgs/development/python-modules/orm/default.nix
@@ -1,43 +1,52 @@
{ lib
+, aiomysql
+, aiosqlite
+, asyncpg
, buildPythonPackage
-, fetchFromGitHub
, databases
+, fetchFromGitHub
+, pythonOlder
, typesystem
-, aiosqlite
-, pytestCheckHook
-, pytest-cov
-, typing-extensions
}:
buildPythonPackage rec {
pname = "orm";
- version = "0.1.5";
+ version = "0.3.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "encode";
repo = "orm";
rev = version;
- sha256 = "1g70cr0559iyqfzidwh6n2qq6d4dcnrr4sg0jkn1s4qzka828mj7";
+ hash = "sha256-nlKEWdqttFnjBnXutlxTy9oILqFzKHKKPJpTtCUbJ5k=";
};
propagatedBuildInputs = [
+ aiomysql
+ aiosqlite
+ asyncpg
databases
typesystem
];
- checkInputs = [
- aiosqlite
- pytestCheckHook
- pytest-cov
- typing-extensions
- ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "typesystem==0.3.1" "typesystem"
+ '';
- pythonImportsCheck = [ "orm" ];
+ # Tests require databases
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "orm"
+ ];
meta = with lib; {
description = "An async ORM";
homepage = "https://github.com/encode/orm";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
index 4f1a4d9df2d4..301e074e67c1 100644
--- a/pkgs/development/python-modules/oslo-utils/default.nix
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -23,12 +23,12 @@
buildPythonPackage rec {
pname = "oslo-utils";
- version = "4.11.0";
+ version = "4.12.0";
src = fetchPypi {
pname = "oslo.utils";
inherit version;
- sha256 = "1wl3r4jayzjgzf36iwn05xcjfh227s97qymjxji9hz4ibhy3v83f";
+ sha256 = "37aa1ee2c6cd8f3933912dd4323cbf7cd2d141e6dedb3debb764e491a9c9cf4d";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix
index 9ea527e06f19..e2519c0b9720 100644
--- a/pkgs/development/python-modules/oyaml/default.nix
+++ b/pkgs/development/python-modules/oyaml/default.nix
@@ -1,21 +1,25 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
-, lib
-# pythonPackages
-, pytest
+ # pythonPackages
+, pytestCheckHook
+, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
pname = "oyaml";
- version = "1.0";
+ version = "unstable-2021-12-03";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "wimglenn";
repo = "oyaml";
- rev = "v${version}";
- sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j";
+ rev = "d0195070d26bd982f1e4e604bded5510dd035cd7";
+ hash = "sha256-1rSEhiULlAweLDqUFX+JBFxe3iW9kNlRA2zjcG8MYSg=";
};
propagatedBuildInputs = [
@@ -23,19 +27,17 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- checkPhase = ''
- pytest test_oyaml.py
- '';
+ pythonImportsCheck = [
+ "oyaml"
+ ];
- meta = {
- description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering";
+ meta = with lib; {
+ description = "Drop-in replacement for PyYAML which preserves dict ordering";
homepage = "https://github.com/wimglenn/oyaml";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [
- kamadorueda
- ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ kamadorueda ];
};
}
diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix
index 466d3937a1fb..066c4a47ae4e 100644
--- a/pkgs/development/python-modules/pa-ringbuffer/default.nix
+++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pa-ringbuffer";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "spatialaudio";
repo = "python-pa-ringbuffer";
rev = version;
- sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv";
+ sha256 = "1d4k6z13mc1f88m6wbhfx8hillb7q78n33ws5bmyblsdkv1gx607";
};
meta = {
diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix
deleted file mode 100644
index 0f9e61859a16..000000000000
--- a/pkgs/development/python-modules/packaging/2.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pyparsing
-, six
-, pytestCheckHook
-, pretend
-}:
-
-# We keep 20.4 because it uses setuptools instead of flit-core
-# which requires Python 3 to build a universal wheel.
-
-buildPythonPackage rec {
- pname = "packaging";
- version = "20.4";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8";
- };
-
- propagatedBuildInputs = [ pyparsing six ];
-
- checkInputs = [
- pytestCheckHook
- pretend
- ];
-
- # Prevent circular dependency
- doCheck = false;
-
- meta = with lib; {
- description = "Core utilities for Python packages";
- homepage = "https://github.com/pypa/packaging";
- license = [ licenses.bsd2 licenses.asl20 ];
- maintainers = with maintainers; [ bennofs ];
- };
-}
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 6df8b5491c9a..1785a8593102 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -9,12 +9,12 @@
}:
buildPythonPackage rec {
- version = "3.0.1";
+ version = "3.1.0";
pname = "pamqp";
src = fetchPypi {
inherit pname version;
- sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4";
+ sha256 = "e4f0886d72c6166637a5513626148bf5a7e818073a558980e9aaed8b4ccf30da";
};
buildInputs = [ mock nose pep8 pylint mccabe ];
diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix
index 4e161d4bfa3c..d94dc48b6d03 100644
--- a/pkgs/development/python-modules/panflute/default.nix
+++ b/pkgs/development/python-modules/panflute/default.nix
@@ -4,29 +4,23 @@
, pyyaml
, buildPythonPackage
, isPy3k
-, fetchpatch
}:
buildPythonPackage rec{
- version = "2.1.0";
+ version = "2.1.3";
pname = "panflute";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "8a3d5dd2a10c3aa6fa8167713fedb47400f0e8ae6ea8346fd4b599842bb1882d";
+ sha256 = "y5QkT+dmiTuy8XLruCfsPe12G4//qE5MhLZ4ufip/5U=";
};
- patches = [
- # Upstream has relaxed the version constaints for the click dependency
- # but there hasn't been a release since then
- (fetchpatch {
- url = "https://github.com/sergiocorreia/panflute/commit/dee6c716a73072a968d67f8638a61de44025d8de.patch";
- sha256 = "sha256-Kj/NTcXsSkevpfr8OwoIQi0p6ChXDM6YgYDPNHJtJZo=";
- })
- ];
- propagatedBuildInputs = [ click pyyaml ];
+ propagatedBuildInputs = [
+ click
+ pyyaml
+ ];
meta = with lib; {
description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index 86cdb73b2607..86154554b692 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "paramiko";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e673b10ee0f1c80d46182d3af7751d033d9b573dd7054d2d0aa46be186c3c1d2";
+ sha256 = "85b1245054e5d7592b9088cc6d08da22445417912d3a3e48138675c7a8616438";
};
propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ];
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index a68f535d29db..16313ab16ee8 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -2,31 +2,28 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
+, pythonAtLeast
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "parso";
- version = "0.8.1";
+ version = "0.8.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e";
+ sha256 = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A=";
};
- patches = [
- # Fix the flaky test due to slow moving time on Apple Silicon chips.
- # Remove when https://github.com/davidhalter/parso/pull/177 is in the next release.
- (fetchpatch {
- url = "https://github.com/davidhalter/parso/pull/177/commits/2799a7a3c2cf87fdc2d0c19a0890acea425091ce.patch";
- sha256 = "sha256-A5EQly1wR/7lo+L8Pp0UPSUIhC0WcblXEWQNvRMlZYA=";
- })
- ];
-
checkInputs = [ pytestCheckHook ];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # python changed exception message format in 3.10, 3.10 not yet supported
+ "test_python_exception_matches"
+ ];
+
meta = with lib; {
description = "A Python Parser";
homepage = "https://parso.readthedocs.io/en/latest/";
diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix
index 72d025c96936..9083953009ad 100644
--- a/pkgs/development/python-modules/parsy/default.nix
+++ b/pkgs/development/python-modules/parsy/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, pythonOlder
, pytestCheckHook
}:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
disabled = pythonOlder "3.5";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7c411373e520e97431f0b390db9d2cfc5089bc1d33f4f1584d2cdc9e6368f302";
+ src = fetchFromGitHub {
+ repo = "parsy";
+ owner = "python-parsy";
+ rev = "v${version}";
+ sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix
new file mode 100644
index 000000000000..11d677e11004
--- /dev/null
+++ b/pkgs/development/python-modules/pdm-pep517/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, git
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pdm-pep517";
+ version = "0.9.4";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c=";
+ };
+
+ preCheck = ''
+ HOME=$TMPDIR
+
+ git config --global user.name nobody
+ git config --global user.email nobody@example.com
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ git
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/pdm-project/pdm-pep517";
+ description = "Yet another PEP 517 backend.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix
index daf4a0458670..c96955d860c7 100644
--- a/pkgs/development/python-modules/pebble/default.nix
+++ b/pkgs/development/python-modules/pebble/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pebble";
- version = "4.6.0";
+ version = "4.6.3";
disabled = isPy27;
src = fetchPypi {
pname = "Pebble";
inherit version;
- sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h";
+ sha256 = "694e1105db888f3576b8f00662f90b057cf3780e6f8b7f57955a568008d0f497";
};
doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index a488f15fbed8..0931cc2b28d8 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -1,46 +1,36 @@
{ lib
, fetchPypi
-, fetchpatch
, buildPythonPackage
-, isPy27
-# Python deps
, logutils
, Mako
-, six
, webtest
-# Test Inputs
+, pythonOlder
, pytestCheckHook
, genshi
, gunicorn
, jinja2
-, Kajiki
-, mock
+, six
, sqlalchemy
, virtualenv
}:
buildPythonPackage rec {
pname = "pecan";
- version = "1.4.0";
+ version = "1.4.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a";
+ sha256 = "sha256-LL0O7btXR8BM3xjEquTxxunZUPOvcK8lRLB09+16BIA=";
};
- patches = [
- (fetchpatch {
- name = "Support-SQLAlchemy-1.4x.patch";
- url = "https://github.com/pecan/pecan/commit/a520bd544c0b02a02dbf692b8d6e2f7a503ee6d4.patch";
- sha256 = "sha256-QCHRjwnpy8ndCvcuyE5Y65BybKYthJXDySUtmpJD8gY=";
- })
- ];
-
propagatedBuildInputs = [
logutils
Mako
- six
webtest
+ six
];
checkInputs = [
@@ -48,19 +38,23 @@ buildPythonPackage rec {
genshi
gunicorn
jinja2
- mock
sqlalchemy
virtualenv
- ] ++ lib.optionals isPy27 [ Kajiki ];
+ ];
pytestFlagsArray = [
- "--pyargs pecan "
+ "--pyargs pecan"
+ ];
+
+ pythonImportsCheck = [
+ "pecan"
];
meta = with lib; {
- description = "WSGI object-dispatching web framework, designed to be lean and fast";
- homepage = "https://www.pecanpy.org/";
changelog = "https://pecan.readthedocs.io/en/latest/changes.html";
+ description = "WSGI object-dispatching web framework";
+ homepage = "https://www.pecanpy.org/";
+ license = licenses.bsd3;
maintainers = with maintainers; [ applePrincess ];
};
}
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 5a8cb430ae6f..44f4dda6b1bc 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.12.40";
+ version = "8.12.41";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "00f2955a456b458f9b6ab0d24329049c3e7358c44dfc1979fe4908ced40f1eb8";
+ sha256 = "f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix
new file mode 100644
index 000000000000..f46ddfca1be2
--- /dev/null
+++ b/pkgs/development/python-modules/pijuice/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, smbus-cffi
+, urwid
+}:
+
+buildPythonPackage rec {
+ pname = "pijuice";
+ version = "1.7";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "PiSupply";
+ repo = "PiJuice";
+ # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project
+ # does not use Github tags facility
+ rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3";
+ sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4=";
+ };
+
+ patches = [
+ # The pijuice_cli.cli file doesn't have a shebang as the first line of the
+ # script. Without it, the pythonWrapPrograms hook will not wrap the program.
+ # Add a python shebang here so that the the hook is triggered.
+ ./patch-shebang.diff
+ ];
+
+ PIJUICE_BUILD_BASE = 1;
+
+ preBuild = ''
+ cd Software/Source
+ '';
+
+ propagatedBuildInputs = [ smbus-cffi urwid ];
+
+ # Remove the following files from the package:
+ #
+ # pijuice_cli - A precompiled ELF binary that is a setuid wrapper for calling
+ # pijuice_cli.py
+ #
+ # pijuiceboot - a precompiled ELF binary for flashing firmware. Not needed for
+ # the python library.
+ #
+ # pijuice_sys.py - A program that acts as a system daemon for monitoring the
+ # pijuice.
+ preFixup = ''
+ rm $out/bin/pijuice_cli
+ rm $out/bin/pijuice_sys.py
+ rm $out/bin/pijuiceboot
+ mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli
+ '';
+
+ meta = with lib; {
+ description = "Library and resources for PiJuice HAT for Raspberry Pi";
+ homepage = "https://github.com/PiSupply/PiJuice";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ hexagonal-sun ];
+ };
+}
diff --git a/pkgs/development/python-modules/pijuice/patch-shebang.diff b/pkgs/development/python-modules/pijuice/patch-shebang.diff
new file mode 100644
index 000000000000..eb899c9a5bde
--- /dev/null
+++ b/pkgs/development/python-modules/pijuice/patch-shebang.diff
@@ -0,0 +1,9 @@
+diff --git a/Software/Source/src/pijuice_cli.py b/Software/Source/src/pijuice_cli.py
+index c366fee..37af383 100644
+--- a/Software/Source/src/pijuice_cli.py
++++ b/Software/Source/src/pijuice_cli.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python3
+ # This python script to be executed as user pijuice by the setuid program pijuice_cli
+ # Python 3 only
+ #
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 6f0f733c4723..f52467f3e59e 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "4.3.0";
+ version = "4.3.1";
disabled = ! isPy3k;
src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-9dSJ6+rZd49rFSQExYnFBGQGZ8MnFM+z/0Iz/nYkW4E=";
+ hash = "sha256-u/NDDJGCcctWL3ivxtU+8CSlQH+5qkmXUcF4RkQOiPI=";
};
patches = [
diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix
deleted file mode 100644
index 61242c894a89..000000000000
--- a/pkgs/development/python-modules/pillow/6.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k
-, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
-, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
-}@args:
-
-import ./generic.nix (rec {
- pname = "Pillow";
- version = "6.2.2";
-
- disabled = !isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv";
- };
-
- meta = with lib; {
- homepage = "https://python-pillow.org/";
- description = "The friendly PIL fork (Python Imaging Library)";
- longDescription = ''
- The Python Imaging Library (PIL) adds image processing
- capabilities to your Python interpreter. This library
- supports many file formats, and provides powerful image
- processing and graphics capabilities.
- '';
- license = "http://www.pythonware.com/products/pil/license.htm";
- maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ];
- knownVulnerabilities = [
- "CVE-2020-10177"
- "CVE-2020-10378"
- "CVE-2020-10379"
- "CVE-2020-10994"
- "CVE-2020-11538"
- "CVE-2020-35653"
- "CVE-2020-35654"
- "CVE-2020-35655"
- "CVE-2021-25289"
- "CVE-2021-25290"
- "CVE-2021-25291"
- "CVE-2021-25292"
- "CVE-2021-25293"
- "CVE-2021-27921"
- "CVE-2021-27922"
- "CVE-2021-27923"
- ];
- };
-} // args )
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 62bab6694d79..9d54eef4d706 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "6.3.1";
+ version = "6.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";
+ sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pip/20.nix b/pkgs/development/python-modules/pip/20.nix
deleted file mode 100644
index e3666d6a7961..000000000000
--- a/pkgs/development/python-modules/pip/20.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, bootstrapped-pip
-, fetchFromGitHub
-, mock
-, scripttest
-, virtualenv
-, pretend
-, pytest
-}:
-
-buildPythonPackage rec {
- pname = "pip";
- version = "20.3.4";
- format = "other";
-
- src = fetchFromGitHub {
- owner = "pypa";
- repo = pname;
- rev = version;
- sha256 = "0hkhs9yc1cjdj1gn9wkycd3sy65c05q8k8rhqgsm5jbpksfssiwn";
- name = "${pname}-${version}-source";
- };
-
- nativeBuildInputs = [ bootstrapped-pip ];
-
- # pip detects that we already have bootstrapped_pip "installed", so we need
- # to force it a little.
- pipInstallFlags = [ "--ignore-installed" ];
-
- checkInputs = [ mock scripttest virtualenv pretend pytest ];
- # Pip wants pytest, but tests are not distributed
- doCheck = false;
-
- meta = {
- description = "The PyPA recommended tool for installing Python packages";
- license = with lib.licenses; [ mit ];
- homepage = "https://pip.pypa.io/";
- priority = 10;
- };
-}
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index fc447bfb98a0..2ddba8f363e3 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -7,18 +7,21 @@
, virtualenv
, pretend
, pytest
+
+# coupled downsteam dependencies
+, pip-tools
}:
buildPythonPackage rec {
pname = "pip";
- version = "21.1.3";
+ version = "21.3.1";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "sha256-zfMz9p4I6Kmw849xuvnmGWHmWtajDntFW1jjDilKkgk=";
+ sha256 = "sha256-A8oePI5VOKGJTY6ZuUhcOhRkz2I2FSdfsS2xIgktCVQ=";
name = "${pname}-${version}-source";
};
@@ -32,6 +35,8 @@ buildPythonPackage rec {
# Pip wants pytest, but tests are not distributed
doCheck = false;
+ passthru.tests = { inherit pip-tools; };
+
meta = {
description = "The PyPA recommended tool for installing Python packages";
license = with lib.licenses; [ mit ];
diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix
index d7473a05bcca..836c3cd38ab2 100644
--- a/pkgs/development/python-modules/pixelmatch/default.nix
+++ b/pkgs/development/python-modules/pixelmatch/default.nix
@@ -1,15 +1,26 @@
-{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }:
+{ lib
+, buildPythonPackage
+, fetchgit
+, pillow
+, poetry-core
+, pytest-benchmark
+, pytest-mypy
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "pixelmatch";
- version = "0.2.2";
+ version = "0.2.3";
format = "pyproject";
- # test fixtures are stored in LFS
+ disabled = pythonOlder "3.6";
+
+ # Test fixtures are stored in LFS
src = fetchgit {
url = "https://github.com/whtsky/pixelmatch-py";
rev = "v${version}";
- sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl";
+ hash = "sha256-/zRQhwz+HjT0Hs4CunsqHxHWEtoIH9qMBowRb0Pps6Y=";
fetchLFS = true;
};
@@ -18,19 +29,24 @@ buildPythonPackage rec {
];
checkInputs = [
- pytestCheckHook
+ pillow
pytest-benchmark
pytest-mypy
- pillow
+ pytestCheckHook
];
pytestFlagsArray = [
- "--mypy"
+ # Incompatible types in assignment
+ #"--mypy"
"--benchmark-disable"
];
+ pythonImportsCheck = [
+ "pixelmatch"
+ ];
+
meta = with lib; {
- description = "A pixel-level image comparison library.";
+ description = "Pixel-level image comparison library";
homepage = "https://github.com/whtsky/pixelmatch-py";
license = licenses.isc;
maintainers = with maintainers; [ petabyteboy ];
diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix
index d59fe56203aa..474d66dafc63 100644
--- a/pkgs/development/python-modules/pkuseg/default.nix
+++ b/pkgs/development/python-modules/pkuseg/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, isPy3k
+, pythonAtLeast
, cython
, numpy
}:
@@ -10,7 +11,7 @@ buildPythonPackage rec {
pname = "pkuseg";
version = "0.0.25";
- disabled = !isPy3k;
+ disabled = !isPy3k || pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pluggy/0.nix b/pkgs/development/python-modules/pluggy/0.nix
deleted file mode 100644
index 30fa2e1945b2..000000000000
--- a/pkgs/development/python-modules/pluggy/0.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ buildPythonPackage
-, lib
-, fetchPypi
-, setuptools-scm
-, importlib-metadata
-}:
-
-buildPythonPackage rec {
- pname = "pluggy";
- version = "0.13.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0";
- };
-
- checkPhase = ''
- py.test
- '';
-
- # To prevent infinite recursion with pytest
- doCheck = false;
-
- nativeBuildInputs = [ setuptools-scm ];
-
- propagatedBuildInputs = [ importlib-metadata ];
-
- meta = {
- description = "Plugin and hook calling mechanisms for Python";
- homepage = "https://github.com/pytest-dev/pluggy";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 28a67f1da82e..91902a857448 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.15.3";
+ version = "0.15.4";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "v${version}";
- sha256 = "sha256-HaH0LcH6L3R9vLT0vlM1absMTbfqgEeVi/aP2FqdnQY=";
+ sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 1957982bd8fe..2375800e3a75 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,8 +1,14 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder, fetchpatch
+{ lib
+, buildPythonPackage
, cachecontrol
, cachy
, cleo
, clikit
+, crashtest
+, dataclasses
+, entrypoints
+, fetchFromGitHub
+, fetchpatch
, html5lib
, httpretty
, importlib-metadata
@@ -12,9 +18,10 @@
, pexpect
, pkginfo
, poetry-core
-, pytestCheckHook
-, pytest-cov
, pytest-mock
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
, requests
, requests-toolbelt
, shellingham
@@ -26,7 +33,8 @@ buildPythonPackage rec {
pname = "poetry";
version = "1.1.12";
format = "pyproject";
- disabled = isPy27;
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-poetry";
@@ -42,13 +50,17 @@ buildPythonPackage rec {
--replace 'version = "^21.2.0"' 'version = ">=21.2"'
'';
- nativeBuildInputs = [ intreehooks ];
+ nativeBuildInputs = [
+ intreehooks
+ ];
propagatedBuildInputs = [
cachecontrol
cachy
cleo
clikit
+ crashtest
+ entrypoints
html5lib
keyring
lockfile
@@ -60,7 +72,11 @@ buildPythonPackage rec {
shellingham
tomlkit
virtualenv
- ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ dataclasses
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
@@ -71,8 +87,16 @@ buildPythonPackage rec {
"$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
'';
- checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ];
- preCheck = "export HOME=$TMPDIR";
+ checkInputs = [
+ pytestCheckHook
+ httpretty
+ pytest-mock
+ ];
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ '';
+
disabledTests = [
# touches network
"git"
@@ -87,11 +111,14 @@ buildPythonPackage rec {
"lock"
# fs permission errors
"test_builder_should_execute_build_scripts"
+ ] ++ lib.optionals (pythonAtLeast "3.10") [
+ # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended
+ "test_info_setup_complex_pep517_error"
];
patches = [
# The following patch addresses a minor incompatibility with
- # pytest-mock. This is addressed upstream in
+ # pytest-mock. This is addressed upstream in
# https://github.com/python-poetry/poetry/pull/3457
(fetchpatch {
url = "https://github.com/python-poetry/poetry/commit/8ddceb7c52b3b1f35412479707fa790e5d60e691.diff";
@@ -99,8 +126,10 @@ buildPythonPackage rec {
})
];
- # allow for package to use pep420's native namespaces
- pythonNamespaces = [ "poetry" ];
+ # Allow for package to use pep420's native namespaces
+ pythonNamespaces = [
+ "poetry"
+ ];
meta = with lib; {
homepage = "https://python-poetry.org/";
diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix
index ca66c777f5b0..27a53eee4281 100644
--- a/pkgs/development/python-modules/policyuniverse/default.nix
+++ b/pkgs/development/python-modules/policyuniverse/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "policyuniverse";
- version = "1.4.0.20210819";
+ version = "1.4.0.20220110";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-RBRUR9Rzw3/yd2ZnteEBigDApJPBagpIk5lSGzeGqL4=";
+ sha256 = "sha256-EWuAhVTX6nXvyXtMuQQIVUbbRZNO8xUXXLR1XHpEid4=";
};
# Tests are not shipped and there are no GitHub tags
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 955b384ed727..dda98f7a8b78 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "21.11.0";
+ version = "22.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-uP4M1ShhKsvqnUixc3JUJVpNQOwYn8Gm2uWVcXhFKLg=";
+ sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
index 03330c4cfec7..27c35abe5739 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -1,25 +1,42 @@
-{ lib, python, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "pony";
- version = "0.7.14";
+ version = "0.7.15rc1";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "ponyorm";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ=";
};
- doCheck = true;
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Tests are outdated
+ "test_exception_msg"
+ "test_method"
+ ];
- # stripping the tests
- postInstall = ''
- rm -rf $out/${python.sitePackages}/pony/orm/tests
- '';
+ pythonImportsCheck = [
+ "pony"
+ ];
meta = with lib; {
- description = "Pony is a Python ORM with beautiful query syntax";
+ description = "Library for advanced object-relational mapping";
homepage = "https://ponyorm.org/";
- maintainers = with maintainers; [ d-goldin xvapx ];
license = licenses.asl20;
+ maintainers = with maintainers; [ d-goldin xvapx ];
};
}
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index 431c2e40487f..86c7b61ae27f 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "pot";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchPypi {
pname = "POT";
inherit version;
- sha256 = "01mdsiv8rlgqzvm3bds9aj49khnn33i523c2cqqrl10zg742pb6l";
+ sha256 = "a70e092ddc5a29a4b526192750604a634dfc2faa1641664b4c2c1c00b3cd63cf";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix
index 43dd1f249ed8..57d8048f0d6d 100644
--- a/pkgs/development/python-modules/ppscore/default.nix
+++ b/pkgs/development/python-modules/ppscore/default.nix
@@ -1,33 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
, pandas
-, scikit-learn
, pytestCheckHook
+, pythonOlder
+, scikit-learn
}:
buildPythonPackage rec {
pname = "ppscore";
- version = "1.1.1";
- disabled = isPy27;
+ version = "unstable-2021-11-25";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "8080labs";
repo = pname;
- rev = version;
- sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2";
+ rev = "c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca";
+ hash = "sha256-qiogjUgcLFauAMpVf2CKNC27c9xR9q7nY69n8/go1ms=";
};
- checkInputs = [ pytestCheckHook ];
-
propagatedBuildInputs = [
pandas
scikit-learn
];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "ppscore"
+ ];
+
meta = with lib; {
- description = "A Python implementation of the Predictive Power Score (PPS)";
+ description = "Python implementation of the Predictive Power Score (PPS)";
homepage = "https://github.com/8080labs/ppscore/";
license = licenses.mit;
maintainers = with maintainers; [ evax ];
diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix
deleted file mode 100644
index 8191e9b5f579..000000000000
--- a/pkgs/development/python-modules/prettytable/1.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, glibcLocales
-, setuptools-scm
-, wcwidth
-}:
-
-buildPythonPackage rec {
- pname = "prettytable";
- version = "1.0.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
- buildInputs = [ glibcLocales ];
-
- propagatedBuildInputs = [ wcwidth ];
-
- preCheck = ''
- export LANG="en_US.UTF-8"
- '';
-
- # no test no longer available in pypi package
- doCheck = false;
- pythonImportsCheck = [ "prettytable" ];
-
- meta = with lib; {
- description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
- homepage = "http://code.google.com/p/prettytable/";
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
index aa44e1396a00..455f4a6e2294 100644
--- a/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
+++ b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "privacyidea-ldap-proxy";
- version = "0.6.2";
+ version = "0.7";
src = fetchFromGitHub {
owner = "privacyidea";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-U2lg4zDQKn9FQ7O0zSLaijIkXKVjg8wi2ItueF4ACDU=";
+ sha256 = "1i2kgxqd38xvb42qj0a4a35w4vk0fyp3n7w48kqmvrxc77p6r6i8";
};
propagatedBuildInputs = [ twisted ldaptor configobj ];
diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index ae67d3d556dc..418e63ec9330 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "prompt-toolkit";
- version = "3.0.22";
+ version = "3.0.23";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "prompt_toolkit";
inherit version;
- sha256 = "sha256-RJ8zPdEgvQH10paozhRSEUujpx+ucojS8K4skYdk+nI=";
+ sha256 = "7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix
index c5560b3ef97c..0f84f324dcf9 100644
--- a/pkgs/development/python-modules/proton-client/default.nix
+++ b/pkgs/development/python-modules/proton-client/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "proton-client";
- version = "0.7.0";
+ version = "0.7.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-python-client";
rev = version;
- sha256 = "sha256-98tEL3DUYtx27JcI6pPFS2iDJXS8K3yyvCU9UVrg1EM=";
+ sha256 = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
index 3a5a7695c8e6..6680b19908e9 100644
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "protonvpn-nm-lib";
- version = "3.5.0";
+ version = "3.7.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = pname;
rev = version;
- sha256 = "sha256-E75toza++l5UFdOLGgolH8pL5xvoUkLE7u+8L5RDFbI=";
+ sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix
new file mode 100644
index 000000000000..fae2c8a42818
--- /dev/null
+++ b/pkgs/development/python-modules/pscript/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, nodejs
+}:
+
+buildPythonPackage rec {
+ pname = "pscript";
+ version = "0.7.6";
+
+ # PyPI tarball doesn't include tests directory
+ src = fetchFromGitHub {
+ owner = "flexxui";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ nodejs
+ ];
+
+ preCheck = ''
+ # do not execute legacy tests
+ rm -rf pscript_legacy
+ '';
+
+ meta = with lib; {
+ description = "Python to JavaScript compiler";
+ license = licenses.bsd2;
+ homepage = "https://pscript.readthedocs.io";
+ maintainers = [ maintainers.matthiasbeyer ];
+ };
+}
+
+
+
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index 81e1627324ad..0ae60b381c64 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "pudb";
- version = "2021.2.2";
+ version = "2022.1";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "82a524ab4b89d2c701b089071ccc6afa9c8a838504e3d68eb33faa8a8abbe4cb";
+ sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index e633e6ce81bf..b98fa7b13397 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "py-nightscout";
- version = "1.3.2";
+ version = "1.3.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "marciogranzotto";
repo = pname;
rev = "v${version}";
- sha256 = "06i8vc7ykk5112y66cjixbrks46mdx3r0ygkmyah6gfgq1ddc39j";
+ sha256 = "0kslmm3wrxhm307nqmjmq8i8vy1x6mjaqlgba0hgvisj6b4hx65k";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/py-tes/default.nix b/pkgs/development/python-modules/py-tes/default.nix
new file mode 100644
index 000000000000..633dc6fa5f4a
--- /dev/null
+++ b/pkgs/development/python-modules/py-tes/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, python-dateutil
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+}:
+
+buildPythonPackage rec {
+ pname = "py-tes";
+ version = "0.4.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "ohsu-comp-bio";
+ repo = pname;
+ rev = version;
+ hash = "sha256-HZeyCQHiqfdquWQD5axS73JDjDMUieONwm5VyA+vTFk=";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ future
+ python-dateutil
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ requests-mock
+ ];
+
+ pythonImportsCheck = [
+ "tes"
+ ];
+
+ meta = with lib; {
+ description = "Python SDK for the GA4GH Task Execution API";
+ homepage = "https://github.com/ohsu-comp-bio/py-tes";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 4c1723edd8ef..f55c869a7a2c 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -1,15 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp, requests }:
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "05f85dacbcf0bdf2459698bab4325f3a699d1c04bc61581627d76d075c3d5488";
+ sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [ aiohttp requests ];
meta = with lib; {
homepage = "https://github.com/eternnoir/pyTelegramBotAPI";
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix
index db26b16e272e..01fae999cf4d 100644
--- a/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/pkgs/development/python-modules/py_scrypt/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "scrypt";
- version = "0.8.18";
+ version = "0.8.19";
src = fetchPypi {
inherit pname version;
- sha256 = "bcf04257af12e6d52974d177a7b08e314b66f350a73f9b6f7b232d69a6a1e041";
+ sha256 = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7";
};
buildInputs = [ openssl ];
diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index a16e77308602..c24bcefec167 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -5,23 +5,22 @@
, botocore
, pandas
, tenacity
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pyathena";
- version = "2.3.2";
+ version = "2.4.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "PyAthena";
inherit version;
- sha256 = "20a473c52e76a211c427d2f711af0a04804a70fc036ab884780e42e0dc2025f7";
+ sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b";
};
- # Nearly all tests depend on a working AWS Athena instance,
- # therefore deactivating them.
- # https://github.com/laughingman7743/PyAthena/#testing
- doCheck = false;
-
propagatedBuildInputs = [
boto3
botocore
@@ -29,6 +28,15 @@ buildPythonPackage rec {
tenacity
];
+ # Nearly all tests depend on a working AWS Athena instance,
+ # therefore deactivating them.
+ # https://github.com/laughingman7743/PyAthena/#testing
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pyathena"
+ ];
+
meta = with lib; {
homepage = "https://github.com/laughingman7743/PyAthena/";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 6a883bbff33f..9f1bd0081084 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "pyatv";
- version = "0.9.6";
+ version = "0.9.8";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "0navm7a0k1679kj7nbkbyl7s2q0wq0xmcnizmnvp0arkd5xqmqv1";
+ sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index 7bf5296eb362..dff1374087a5 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pybotvac";
- version = "0.0.22";
+ version = "0.0.23";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-hl8UmoVUbbHCSpCWdUTxoIlop5di+rUmGUQI9UWq3ik=";
+ sha256 = "54b4fe565c10000c54d5644d081e2de1f850daefbac39cea74cea649b47bfb12";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycairo/1.18.nix b/pkgs/development/python-modules/pycairo/1.18.nix
deleted file mode 100644
index 9da4da1479c0..000000000000
--- a/pkgs/development/python-modules/pycairo/1.18.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib
-, fetchFromGitHub
-, meson
-, ninja
-, buildPythonPackage
-, pytestCheckHook
-, pkg-config
-, cairo
-, python
-}:
-
-buildPythonPackage rec {
- pname = "pycairo";
- version = "1.18.2";
-
- format = "other";
-
- src = fetchFromGitHub {
- owner = "pygobject";
- repo = "pycairo";
- rev = "v${version}";
- sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j";
- };
-
- nativeBuildInputs = [
- meson
- ninja
- pkg-config
- ];
-
- buildInputs = [
- cairo
- ];
-
- checkInputs = [
- pytestCheckHook
- ];
-
- mesonFlags = [
- # This is only used for figuring out what version of Python is in
- # use, and related stuff like figuring out what the install prefix
- # should be, but it does need to be able to execute Python code.
- "-Dpython=${python.pythonForBuild.interpreter}"
- ];
-
- meta = with lib; {
- description = "Python 2 bindings for cairo";
- homepage = "https://pycairo.readthedocs.io/";
- license = with licenses; [ lgpl21Only mpl11 ];
- platforms = lib.platforms.linux ++ lib.platforms.darwin;
- };
-}
diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix
index fa75d02c6101..13757c9f0088 100644
--- a/pkgs/development/python-modules/pycocotools/default.nix
+++ b/pkgs/development/python-modules/pycocotools/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pycocotools";
- version = "2.0.3";
+ version = "2.0.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-OCkCSTABN3EVZSGkuNtLOu9ZBVbPo6jdP6sCfTmyFeE=";
+ sha256 = "2ab586aa389b9657b6d73c2b9a827a3681f8d00f36490c2e8ab05902e3fd9e93";
};
propagatedBuildInputs = [
@@ -32,6 +32,6 @@ buildPythonPackage rec {
description = "Official APIs for the MS-COCO dataset";
homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI";
license = licenses.bsd2;
- maintainers = with maintainers; [ hexa piegames ];
+ maintainers = with maintainers; [ piegames ];
};
}
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index 797da43352df..375453231b9b 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pycognito";
- version = "2021.03.1";
+ version = "2022.01.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pvizeli";
repo = pname;
rev = version;
- sha256 = "sha256-V3R6i1/FZrjcfRqJhczjURr/+x++iCvZ3aCK9wdEL1A=";
+ sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index 6f2f887967e4..5457e44dc3b1 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -1,16 +1,17 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchPypi
, python
-, lib
}:
buildPythonPackage rec {
pname = "pydal";
- version = "20210626.3";
+ version = "20220114.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "043s52b7srqwwmj7rh783arqryilmv3m8dmmg9bn5sjgfi004jn4";
+ sha256 = "8c872f1fd6759eef497d72cf33fe57537be86ccf23515bd47e1f8a04d862236e";
};
postPatch = ''
@@ -33,10 +34,10 @@ buildPythonPackage rec {
runHook postCheck
'';
- meta = {
- description = "A pure Python Database Abstraction Layer";
+ meta = with lib; {
+ description = "Python Database Abstraction Layer";
homepage = "https://github.com/web2py/pydal";
- license = with lib.licenses; [ bsd3 ] ;
- maintainers = with lib.maintainers; [ wamserma ];
+ license = with licenses; [ bsd3 ] ;
+ maintainers = with maintainers; [ wamserma ];
};
}
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 69a080c1d716..1072a4e24422 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pydantic";
- version = "1.8.2";
+ version = "1.9.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
- sha256 = "06162dss6mvi7wiy2lzxwvzajwxgy8b2fyym7qipaj7zibcqalq2";
+ sha256 = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix
index f8a5d2ed4ae9..151a0c5a9669 100644
--- a/pkgs/development/python-modules/pydelijn/default.nix
+++ b/pkgs/development/python-modules/pydelijn/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pydelijn";
- version = "0.6.1";
+ version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1lwd2f043hy7gf1ly9zpaq1yg947bqw2af8vhwssf48zpisfgc81";
+ sha256 = "c5b6565c50d4f97d28baca9faf487281c2a5db635060b69f659e27c28a1a6e93";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index ca4c74e2a05c..f4ee3f6ad652 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "pydevccu";
- version = "0.0.9";
+ version = "0.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -15,14 +15,9 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-/4sJ5T17nCcTjg1Me4zTlOEOkK1py9kl2YeLGv4X6us=";
+ sha256 = "sha256-bLXACJPiHZlJzoDm7N9RWskN+qQddSkGFX9d4YcTaLo=";
};
- postPatch = ''
- # Fix file name, https://github.com/danielperna84/pydevccu/pull/8
- mv pydevccu/paramset_descriptions/HmIP-STDH.json pydevccu/paramset_descriptions/HmIP-STHD.json
- '';
-
# Module has no tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix
new file mode 100644
index 000000000000..2491bc5ff9a7
--- /dev/null
+++ b/pkgs/development/python-modules/pydrive2/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-api-python-client
+, oauth2client
+, pyopenssl
+, pyyaml
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "pydrive2";
+ version = "1.10.0";
+
+ src = fetchPypi {
+ pname = "PyDrive2";
+ inherit version;
+ sha256 = "sha256-970ZtP8e9sC5IvtqxVwNlHJKtTc4euSh3nl3hNd0Y6s=";
+ };
+
+ propagatedBuildInputs = [
+ google-api-python-client
+ oauth2client
+ pyopenssl
+ pyyaml
+ six
+ ];
+
+ doCheck = false;
+
+ pythonImportsCheck = [ "pydrive2" ];
+
+ meta = {
+ description = "Google Drive API Python wrapper library. Maintained fork of PyDrive.";
+ homepage = "https://github.com/iterative/PyDrive2";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ sei40kr ];
+ };
+}
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index eb6734649b5d..ae7277202bbc 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -15,22 +15,14 @@
buildPythonPackage rec {
pname = "pygal";
- version = "2.4.0";
+ version = "3.0.0";
doCheck = !isPyPy; # one check fails with pypy
src = fetchPypi {
inherit pname version;
- sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83";
+ sha256 = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI=";
};
- patches = [
- # Fixes compatibility with latest pytest. October 12, 2020.
- # Should be included in the next release after 2.4.0
- (fetchpatch {
- url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch";
- sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l";
- })
- ];
buildInputs = [
flask
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index ab4ca1efdc15..4f3a9de3a36f 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pygit2";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d7faa29558436decc2e78110f38d6677eb366b683ba5cdc2803d47195711165d";
+ sha256 = "70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index 1ce36111ff78..4c557b2676cd 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -29,6 +29,12 @@ buildPythonPackage rec {
pydantic
typeguard
];
+ # We don't know why an early version of pydantic is required, see:
+ # https://github.com/openlawlibrary/pygls/issues/221
+ preBuild = ''
+ substituteInPlace setup.cfg \
+ --replace "pydantic>=1.7,<1.9" "pydantic"
+ '';
checkInputs = [
mock
diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix
deleted file mode 100644
index ce9410eaf8b5..000000000000
--- a/pkgs/development/python-modules/pygobject/3.36.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
-pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }:
-
-buildPythonPackage rec {
- pname = "pygobject";
- version = "3.36.1";
-
- format = "other";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
- };
-
- outputs = [ "out" "dev" ];
-
- mesonFlags = [
- "-Dpython=python${if isPy3k then "3" else "2" }"
- ];
-
- nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
- buildInputs = [ glib gobject-introspection ]
- ++ lib.optionals stdenv.isDarwin [ which ncurses ];
- propagatedBuildInputs = [ pycairo cairo ];
-
- meta = with lib; {
- homepage = "https://pygobject.readthedocs.io/";
- description = "Python bindings for Glib";
- license = licenses.gpl2;
- maintainers = with maintainers; [ orivej ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index bac70be9987f..3c0552ef4d3c 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "pygraphviz";
- version = "1.7";
+ version = "1.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a7bec6609f37cf1e64898c59f075afd659106cf9356c5f387cecaa2e0cdb2304";
+ hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU=";
extension = "zip";
};
@@ -36,9 +36,13 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
+ runHook preCheck
pytest --pyargs pygraphviz
+ runHook postCheck
'';
+ pythonImportsCheck = [ "pygraphviz" ];
+
meta = with lib; {
description = "Python interface to Graphviz graph drawing package";
homepage = "https://github.com/pygraphviz/pygraphviz";
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
deleted file mode 100644
index 938b55630c06..000000000000
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
-, buildPythonPackage, libglade ? null, isPy3k }:
-
-buildPythonPackage rec {
- pname = "pygtk";
- version = "2.24.0";
-
- disabled = isPy3k;
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
- };
-
- patches = [
- # https://bugzilla.gnome.org/show_bug.cgi?id=660216 - fixes some memory leaks
- (fetchpatch {
- url = "https://gitlab.gnome.org/Archive/pygtk/commit/eca72baa5616fbe4dbebea43c7e5940847dc5ab8.diff";
- sha256 = "031px4w5cshcx1sns430sdbr2i007b9zyb2carb3z65nzr77dpdd";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/Archive/pygtk/commit/4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch";
- sha256 = "0z8cg7nr3qki8gg8alasdzzyxcihfjlxn518glq5ajglk3q5pzsn";
- })
- ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- pango
- ] ++ lib.optional (libglade != null) libglade;
-
- propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
-
- configurePhase = "configurePhase";
-
- buildPhase = "buildPhase";
-
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC";
-
- installPhase = "installPhase";
-
- checkPhase = lib.optionalString (libglade == null)
- ''
- sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
- tests/common.py
- sed -i -e "s/, glade$//" \
- -e "s/.*testGlade.*//" \
- -e "s/.*(glade.*//" \
- tests/test_api.py
- '' + ''
- sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
- -e "s/sys.path.insert(0, buildDir)//" \
- tests/common.py
- make check
- '';
- # XXX: TypeError: Unsupported type: <class 'gtk._gtk.WindowType'>
- # The check phase was not executed in the previous
- # non-buildPythonPackage setup - not sure why not.
- doCheck = false;
-
- postInstall = ''
- rm $out/bin/pygtk-codegen-2.0
- ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
- ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \
- $out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth
- '';
-
- meta = with lib; {
- description = "GTK 2 Python bindings";
- homepage = "https://gitlab.gnome.org/Archive/pygtk";
- platforms = platforms.all;
- license = with licenses; [ lgpl21Plus ];
- };
-}
diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix
index f62d8bd1305f..fb0b22cd4440 100644
--- a/pkgs/development/python-modules/pyhiveapi/default.nix
+++ b/pkgs/development/python-modules/pyhiveapi/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pyhiveapi";
- version = "0.4.3";
+ version = "0.4.6";
format = "pyproject";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Pyhass";
repo = "Pyhiveapi";
rev = "v${version}";
- sha256 = "sha256-SCMASYBOdq9nko5RSQ5BEbRLjOB4FlgwOKwdDggiOv8=";
+ hash = "sha256-muUVZYBUloKRnAx7H8ry72eg85GzmnpTG8M/MfKcnGM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 636ea1658fff..e30063e826d9 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.76";
+ version = "0.1.77";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "ea2496c920451ded4561e3758c8f77157fc00c40d1f75d8163e399fd3e0d795a";
+ sha256 = "00d95c21b95a17bc07586f69c976fb343a103adc0954d7b2d56c7160665625cb";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/pyjwt/1.nix b/pkgs/development/python-modules/pyjwt/1.nix
deleted file mode 100644
index 9978302d1cc4..000000000000
--- a/pkgs/development/python-modules/pyjwt/1.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cryptography
-, ecdsa
-, pytestCheckHook
-, pythonOlder
-}:
-
-buildPythonPackage rec {
- pname = "pyjwt";
- version = "1.7.1";
-
- src = fetchPypi {
- pname = "PyJWT";
- inherit version;
- sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
- };
-
- postPatch = ''
- sed -i '/^addopts/d' setup.cfg
- '';
-
- propagatedBuildInputs = [
- cryptography
- ecdsa
- ];
-
- checkInputs = [
- pytestCheckHook
- ];
-
- disabledTests = [
- "test_ec_verify_should_return_false_if_signature_invalid"
- ];
-
- pythonImportsCheck = [ "jwt" ];
-
- meta = with lib; {
- description = "JSON Web Token implementation in Python";
- homepage = "https://github.com/jpadilla/pyjwt";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index 4617869988f6..8212d097aa80 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pyjwt";
- version = "2.1.0";
+ version = "2.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "PyJWT";
inherit version;
- sha256 = "sha256-+6ROeJi7yhYKKytQH0koJPyDgkhdOm8Rul0MGTfOYTA=";
+ sha256 = "sha256-uIi01W8G9tzXdyEMM05pxze+dHVdPl6e4/5n3Big7kE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix
index b27ee6b2ecec..145ea83abeb8 100644
--- a/pkgs/development/python-modules/pykeyatome/default.nix
+++ b/pkgs/development/python-modules/pykeyatome/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pykeyatome";
- version = "1.3.0";
+ version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jugla";
repo = "pyKeyAtome";
rev = "V${version}";
- sha256 = "1brcfgqj0bana6yii4083kppz822fgk9xf4mg141b0zfvx2gyjw9";
+ sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax";
};
propagatedBuildInputs = [
@@ -52,7 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to get data from Atome Key";
- homepage = "hhttps://github.com/jugla/pyKeyAtome";
+ homepage = "https://github.com/jugla/pyKeyAtome";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix
index d6ad5480ddd3..552d30c70f35 100644
--- a/pkgs/development/python-modules/pylaunches/default.nix
+++ b/pkgs/development/python-modules/pylaunches/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pylaunches";
- version = "1.2.0";
+ version = "1.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "0mczxkwczyh9kva4xzpmnawy0hjha1fdrwj6igip9w5z1q48zs49";
+ sha256 = "sha256-WwtNgKP5YM9i7au02taOfJuKQy6DDmmBrE34EPvJYmA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylgnetcast/default.nix b/pkgs/development/python-modules/pylgnetcast/default.nix
index cadb4bb83839..51e3dfdab28f 100644
--- a/pkgs/development/python-modules/pylgnetcast/default.nix
+++ b/pkgs/development/python-modules/pylgnetcast/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pylgnetcast";
- version = "0.3.5";
+ version = "0.3.7";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Drafteed";
repo = "python-lgnetcast";
rev = "v${version}";
- sha256 = "11g7ya4ppqxjiv3fkz9mi6h1afw9icy6xyn4jzm63kjvxqhrwnw4";
+ sha256 = "0pmz52k2sfxj5x2wcwdjks2lqh1gb5zfrjgc6xij8jal4l9xd2dz";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index 8e7439a80d48..4bb3cabac384 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "08ppwlsnrvzkpi4fn14d4d4grzx2bmsd0m9369q3f9hw48fgf645";
+ sha256 = "8518f71c221c263770322355d0745da2fffc48238d04eb48bcf3ef6c35e5f722";
};
propagatedBuildInputs = [ future lxml ];
diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix
index f6fdd60a3872..b153b14c5f3b 100644
--- a/pkgs/development/python-modules/pymazda/default.nix
+++ b/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,14 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.3.0";
+ version = "0.3.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-D0odz4GkKvjuafhEGlHtRnO8lk4rV9y3imaHl7jXqJw=";
+ sha256 = "eb4b275bcdfbf947e00b27c20dfc8ebcedfc1fb1252449141eccb5c39d782440";
};
propagatedBuildInputs = [
@@ -23,7 +25,10 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "pymazda" ];
+
+ pythonImportsCheck = [
+ "pymazda"
+ ];
meta = with lib; {
description = "Python client for interacting with the MyMazda API";
diff --git a/pkgs/development/python-modules/pymelcloud/default.nix b/pkgs/development/python-modules/pymelcloud/default.nix
index d747af697bcc..ed06b347b694 100644
--- a/pkgs/development/python-modules/pymelcloud/default.nix
+++ b/pkgs/development/python-modules/pymelcloud/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pymelcloud";
- version = "2.5.6";
+ version = "2.11.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "vilppuvuorinen";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QXOL3MftNibo1wUjz/KTQLNDk7pWL9VH/wd7LpEJOmE=";
+ sha256 = "1q6ny58cn9qy86blxbk6l2iklab7y11b734l7yb1bp35dmy27w26";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 6b627ca672ff..bae4f7c25fb8 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pymongo";
- version = "3.12.1";
+ version = "3.12.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "704879b6a54c45ad76cea7c6789c1ae7185050acea7afd15b58318fa1932ed45";
+ sha256 = "64ea5e97fca1a37f83df9f3460bf63640bc0d725e12f3471e6acbf3a6040dd37";
};
# Tests call a running mongodb instance
diff --git a/pkgs/development/python-modules/pymsteams/default.nix b/pkgs/development/python-modules/pymsteams/default.nix
index 7eca666a9cca..0f452607518b 100644
--- a/pkgs/development/python-modules/pymsteams/default.nix
+++ b/pkgs/development/python-modules/pymsteams/default.nix
@@ -1,25 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pymsteams";
- version = "0.1.16";
+ version = "0.2.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "rveachkc";
repo = pname;
rev = version;
- sha256 = "sha256-dRfzMCsU+jRdnqzIBLn1mPWr+UDq1HFfXXqe1dVhGDo=";
+ sha256 = "03lna3p8qkmsmaz2nzl76dnz6rci08wsybvr151zl8wwpjdj1sam";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [
+ requests
+ ];
# Tests require network access
doCheck = false;
- pythonImportsCheck = [ "pymsteams" ];
+
+ pythonImportsCheck = [
+ "pymsteams"
+ ];
meta = with lib; {
description = "Python module to interact with Microsoft Teams";
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 0b147c971b02..f7555d48ebb6 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pymupdf";
- version = "1.18.17";
+ version = "1.19.2";
src = fetchPypi {
pname = "PyMuPDF";
inherit version;
- sha256 = "fa39ee5e91eae77818e07b6bb7e0cb0b402ad88e39a74b08626ce1c2150c5414";
+ sha256 = "964bbacddab9cba6cd2c8f388429fe4a97c0775b3096a13ac15724f5a1a2c58d";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index eeb6ad017984..54fb270a1765 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pynetbox";
- version = "6.4.1";
+ version = "6.5.0";
src = fetchFromGitHub {
owner = "netbox-community";
repo = pname;
rev = "v${version}";
- sha256 = "08k2zxfz23gzbk49r3hmh6r3m5rgx1gk7w83qxi1v4gbm4wr0v9m";
+ sha256 = "1fk64bi7aswsmfqsciamml2wydgfg464h6i7479xfim4mwmkkik4";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index 3afa8fcf8651..fa2b369aa2ba 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -48,11 +48,12 @@ buildPythonPackage rec {
"TestMoveSCPCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
+ "TestState"
+ "TestStorageServiceClass"
"TestStoreSCP"
"TestStoreSCPCLI"
"TestStoreSCU"
"TestStoreSCUCLI"
- "TestState"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
new file mode 100644
index 000000000000..11313dcadc69
--- /dev/null
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pynut2";
+ version = "2.1.2";
+
+ src = fetchFromGitHub {
+ owner = "mezz64";
+ repo = "python-nut2";
+ rev = version;
+ sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ pythonImportsCheck = [ "pynut2.nut2" ];
+
+ # tests are unmaintained and broken
+ doCheck = false;
+
+ meta = with lib; {
+ description = "API overhaul of PyNUT, a Python library to allow communication with NUT (Network UPS Tools) servers.";
+ homepage = "https://github.com/mezz64/python-nut2";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = [ maintainers.luker ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index 99f002b9317b..e8d89e9ef2d2 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -1,26 +1,28 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, isPy27
, pyutilib
, appdirs
, ply
, six
, nose
+, glpk
}:
buildPythonPackage rec {
pname = "pyomo";
- version = "5.6.1";
+ version = "5.7.3";
disabled = isPy27; # unable to import pyutilib.th
- src = fetchPypi {
- pname = "Pyomo";
- inherit version;
- sha256 = "449be9a4c9b3caee7c89dbe5f0e4e5ad0eaeef8be110a860641cd249986e362c";
+ src = fetchFromGitHub {
+ repo = "pyomo";
+ owner = "pyomo";
+ rev = version;
+ sha256 = "sha256-p0/DdCwyXdzXElzjWewKs0Oi7BMXC+BxgYikdZL0t68=";
};
- checkInputs = [ nose ];
+ checkInputs = [ nose glpk ];
propagatedBuildInputs = [
pyutilib
appdirs
@@ -30,7 +32,10 @@ buildPythonPackage rec {
checkPhase = ''
rm pyomo/bilevel/tests/test_blp.py \
- pyomo/version/tests/test_installer.py
+ pyomo/version/tests/test_installer.py \
+ pyomo/common/tests/test_download.py \
+ pyomo/core/tests/examples/test_pyomo.py
+ export HOME=$TMPDIR
nosetests
'';
diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index b2d62e3730d1..72d6ae332583 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyopengl";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchPypi {
pname = "PyOpenGL";
inherit version;
- sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee";
+ sha256 = "4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424";
};
propagatedBuildInputs = [ pillow ];
diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix
index 08eb002ec31f..fd88e0fe4fe2 100644
--- a/pkgs/development/python-modules/pyqt-builder/default.nix
+++ b/pkgs/development/python-modules/pyqt-builder/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyqt-builder";
- version = "1.10.1";
+ version = "1.12.2";
src = fetchPypi {
pname = "PyQt-builder";
inherit version;
- sha256 = "05vyckg4pq95s3b23drhd24sjwzic1k36nwckxz5jc83mixhqywn";
+ sha256 = "f62bb688d70e0afd88c413a8d994bda824e6cebd12b612902d1945c5a67edcd7";
};
propagatedBuildInputs = [ packaging sip ];
diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix
new file mode 100644
index 000000000000..48c8d991175f
--- /dev/null
+++ b/pkgs/development/python-modules/pyquaternion/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "pyquaternion";
+ version = "0.9.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg=";
+ };
+
+ # The VERSION.txt file is required for setup.py
+ # See: https://github.com/KieranWynn/pyquaternion/blob/master/setup.py#L14-L15
+ postPatch = ''
+ echo "${version}" > VERSION.txt
+ '';
+
+ propagatedBuildInputs = [ numpy ];
+
+ checkInputs = [ nose ];
+ pythonImportsCheck = [ "pyquaternion" ];
+
+ meta = with lib; {
+ description = "Library for representing and using quaternions.";
+ homepage = "http://kieranwynn.github.io/pyquaternion/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyradios/default.nix b/pkgs/development/python-modules/pyradios/default.nix
index f95988063dd2..06d5f9724833 100644
--- a/pkgs/development/python-modules/pyradios/default.nix
+++ b/pkgs/development/python-modules/pyradios/default.nix
@@ -1,11 +1,21 @@
-{ lib, buildPythonPackage, fetchPypi, appdirs, requests }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, appdirs
+, requests
+, pythonOlder
+}:
+
buildPythonPackage rec {
pname = "pyradios";
- version = "0.0.22";
+ version = "1.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1bgfb8vz7jybswss16pdzns0qpqfrwa9f2g8qrh1r4mig4xh2dmi";
+ sha256 = "0fd3b234c635d9e628bdadb9dc3a820405631b54977402719a641d2e1cc3f7b6";
};
propagatedBuildInputs = [
@@ -13,6 +23,7 @@ buildPythonPackage rec {
requests
];
+ # Tests and pythonImportsCheck require network access
doCheck = false;
meta = with lib; {
diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix
index b8104ef23707..e76152e218d4 100644
--- a/pkgs/development/python-modules/pyrmvtransport/default.nix
+++ b/pkgs/development/python-modules/pyrmvtransport/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, pythonOlder
, flit
, async-timeout
@@ -41,6 +42,15 @@ buildPythonPackage rec {
pytest-httpx
];
+ patches = [
+ # Can be removed with next release, https://github.com/cgtobi/PyRMVtransport/pull/55
+ (fetchpatch {
+ name = "update-tests.patch";
+ url = "https://github.com/cgtobi/PyRMVtransport/commit/fe93b3d9d625f9ccf8eb7b0c39e0ff41c72d2e77.patch";
+ sha256 = "sha256-t+GP5VG1S86vVSsisl85ZHBtOqxIi7QS83DA+HgRet4=";
+ })
+ ];
+
pythonImportsCheck = [
"RMVtransport"
];
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 867e42485975..96b0e08a56d9 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -10,14 +10,16 @@
}:
buildPythonPackage rec {
- pname = "Pyro4";
- version = "4.81";
+ pname = "pyro4";
+ version = "4.82";
+ format = "setuptools";
disabled = isPy27;
src = fetchPypi {
- inherit pname version;
- sha256 = "e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f";
+ pname = "Pyro4";
+ inherit version;
+ hash = "sha256-UR9bCATpLdd9wzrfnJR3h+P56cWpaxIWLwVXp8TOIfs=";
};
propagatedBuildInputs = [
@@ -30,13 +32,18 @@ buildPythonPackage rec {
msgpack
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
# add testsupport.py to PATH
preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH";
- # ignore network related tests, which fail in sandbox
- pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ];
+
+ pytestFlagsArray = [
+ # ignore network related tests, which fail in sandbox
+ "--ignore=tests/PyroTests/test_naming.py"
+ ];
disabledTests = [
"StartNSfunc"
@@ -47,6 +54,10 @@ buildPythonPackage rec {
# otherwise the tests hang the build
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [
+ "Pyro4"
+ ];
+
meta = with lib; {
description = "Distributed object middleware for Python (RPC)";
homepage = "https://github.com/irmen/Pyro4";
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index 6710d3d286e6..c345c988d257 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -1,31 +1,32 @@
{ lib
, buildPythonPackage
, pythonOlder
-, fetchFromGitHub
+, fetchPypi
, pyaes
, pysocks
, async-lru
+, tgcrypto
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "pyrogram";
- version = "1.2.0";
+ version = "1.3.6";
disabled = pythonOlder "3.6";
- src = fetchFromGitHub {
- owner = "pyrogram";
- repo = "pyrogram";
- rev = "v${version}";
- sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q";
+ src = fetchPypi {
+ pname = "Pyrogram";
+ inherit version;
+ hash = "sha256-Q3JGTNSfqEMUqEru0crcbE8Ut/n+9MjFIDRKRSZ7tlE=";
};
propagatedBuildInputs = [
pyaes
pysocks
async-lru
+ tgcrypto
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pyroma/2.nix b/pkgs/development/python-modules/pyroma/2.nix
deleted file mode 100644
index 9fee5ec56c0e..000000000000
--- a/pkgs/development/python-modules/pyroma/2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, docutils, pygments, setuptools
-}:
-
-buildPythonPackage rec {
- pname = "pyroma";
- version = "2.6.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f";
- };
-
- postPatch = ''
- substituteInPlace setup.py \
- --replace "pygments < 2.6" "pygments"
- '';
-
- propagatedBuildInputs = [ docutils pygments setuptools ];
-
- meta = with lib; {
- description = "Test your project's packaging friendliness";
- homepage = "https://github.com/regebro/pyroma";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index cf2325633fba..81fc1d5709e9 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pysma";
- version = "0.6.9";
+ version = "0.6.10";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2ZU3UjDNo+fpnYK4WlYSu7XqkbpcK7Xz5cUKDABhwdk=";
+ sha256 = "990abf6dba3f52b98970fc95aaf484e521faa9ff28c9c19f5a6dca3fddf5840c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix
index b92ba38c9d09..f5675aae8ed8 100644
--- a/pkgs/development/python-modules/pysnooper/default.nix
+++ b/pkgs/development/python-modules/pysnooper/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "1.1.0";
pname = "pysnooper";
src = fetchPypi {
inherit version;
pname = "PySnooper";
- sha256 = "4804aed962f36db85fefdc33edbd109b96a13153e6ffed82d1e6023b4f483b64";
+ sha256 = "0fa932ad396d2bac089d4b1f94f0ce49cde4140ee64ddd24a4065fadea10fcc9";
};
# test dependency python-toolbox fails with py27
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 8ba191317ea0..561ec037c0a2 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SPNEGO authentication library";
- homepage = "Python SPNEGO authentication library";
+ homepage = "https://github.com/jborean93/pyspnego";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix
deleted file mode 100644
index 09cc312223ad..000000000000
--- a/pkgs/development/python-modules/pysqlite/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "pysqlite";
- version = "2.8.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490";
- };
-
- # Need to use the builtin sqlite3 on Python 3
- disabled = isPy3k;
-
- # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files
- # it contains is not taken into account. Thus, we must explicitly make
- # it a propagated input.
- propagatedBuildInputs = [ pkgs.sqlite ];
-
- patchPhase = ''
- substituteInPlace "setup.cfg" \
- --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \
- --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
- ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
- '';
-
- meta = with lib; {
- homepage = "https://pysqlite.org/";
- description = "Python bindings for the SQLite embedded relational database engine";
- longDescription = ''
- pysqlite is a DB-API 2.0-compliant database interface for SQLite.
-
- SQLite is a relational database management system contained in
- a relatively small C library. It is a public domain project
- created by D. Richard Hipp. Unlike the usual client-server
- paradigm, the SQLite engine is not a standalone process with
- which the program communicates, but is linked in and thus
- becomes an integral part of the program. The library
- implements most of SQL-92 standard, including transactions,
- triggers and most of complex queries.
-
- pysqlite makes this powerful embedded SQL engine available to
- Python programmers. It stays compatible with the Python
- database API specification 2.0 as much as possible, but also
- exposes most of SQLite's native API, so that it is for example
- possible to create user-defined SQL functions and aggregates
- in Python.
- '';
- license = licenses.bsd3;
- };
-
-}
diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index a51f15f5eeb7..96037d512838 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "pyswitchbot";
- version = "0.13.0";
+ version = "0.13.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = version;
- sha256 = "sha256-dx3OMzWJohOYCg7TnrqL4FLZoC+Q1dyJyUAdreDyfl0=";
+ sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
index 7936d6e4ac2d..1b06dad829d9 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -6,8 +6,9 @@
}:
buildPythonPackage rec {
- version = "1.0.4";
pname = "pytest-annotate";
+ version = "1.0.4";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -22,19 +23,17 @@ buildPythonPackage rec {
pyannotate
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "pytest>=3.2.0,<4.0.0" "pytest"
- '';
-
- # no testing in a testing module...
+ # Module has no tests
doCheck = false;
+ pythonImportsCheck = [
+ "pytest_annotate"
+ ];
+
meta = with lib; {
- broken = true; # unmaintained and incompatible with pytest>=6.0
- homepage = "https://github.com/kensho-technologies/pytest-annotate";
description = "Generate PyAnnotate annotations from your pytest tests";
+ homepage = "https://github.com/kensho-technologies/pytest-annotate";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 9e09724624c2..4059a3c12fbe 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,29 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hypothesis
+, pytest
+, pytestCheckHook
+, pythonOlder
+}:
+
buildPythonPackage rec {
pname = "pytest-asyncio";
version = "0.16.0";
+ format = "setuptools";
- disabled = !isPy3k;
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb";
+ src = fetchFromGitHub {
+ owner = "pytest-dev";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-4zMbzdDtiLRKo5C12wZRoBNguXLn3f26NuDwQ+pHA0I=";
};
- buildInputs = [ pytest ]
- ++ lib.optionals isPy35 [ async_generator ];
+ buildInputs = [
+ pytest
+ ];
- # No tests in archive
- doCheck = false;
+ checkInputs = [
+ hypothesis
+ pytestCheckHook
+ ];
- # LICENSE file is not distributed. https://github.com/pytest-dev/pytest-asyncio/issues/92
- postPatch = ''
- substituteInPlace setup.cfg --replace "license_file = LICENSE" ""
- '';
+ pythonImportsCheck = [
+ "pytest_asyncio"
+ ];
meta = with lib; {
description = "library for testing asyncio code with pytest";
- license = licenses.asl20;
homepage = "https://github.com/pytest-dev/pytest-asyncio";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index b84b42e351db..b9def8d834af 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -1,32 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytest
+, pathlib
, py-cpuinfo
+, pytest
, pythonOlder
-, pathlib
, statistics
}:
buildPythonPackage rec {
pname = "pytest-benchmark";
- version = "3.2.2";
+ version = "3.4.1";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "ionelmc";
repo = pname;
rev = "v${version}";
- sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj";
+ sha256 = "sha256-qc/8Epax5bPUZvhq42xSj6NUq0T4gbO5dDDS6omWBOU=";
};
- buildInputs = [ pytest ];
+ buildInputs = [
+ pytest
+ ];
+
+ propagatedBuildInputs = [
+ py-cpuinfo
+ ] ++ lib.optionals (pythonOlder "3.4") [
+ pathlib
+ statistics
+ ];
+
+ # Circular dependency
+ doCheck = false;
- propagatedBuildInputs = [ py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ];
+ pythonImportsCheck = [
+ "pytest_benchmark"
+ ];
- meta = {
- description = "Py.test fixture for benchmarking code";
+ meta = with lib; {
+ description = "Pytest fixture for benchmarking code";
homepage = "https://github.com/ionelmc/pytest-benchmark";
- license = lib.licenses.bsd2;
- maintainers = with lib.maintainers; [ costrouc ];
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix
index ccbf5401bd21..c3374032d333 100644
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytest-cases";
- version = "3.6.7";
+ version = "3.6.8";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ZUAXmIww/tdm7nDAj2VDXq0B6raHeDX1ywxnnv3EVIE=";
+ sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index a77295458733..3498b9f8ab94 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -7,12 +7,13 @@
buildPythonPackage rec {
pname = "pytest-check";
- version = "1.0.1";
+ version = "1.0.4";
+ format = "flit";
src = fetchPypi {
pname = "pytest_check";
inherit version;
- sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
+ sha256 = "c93eee5a98bcd28634a4ec657ab62c46d25fa384300811e5a925d9c4d98b9540";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 47cc882f548e..d3b2bc66aae4 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
}:
buildPythonPackage rec {
pname = "pytest-django";
- version = "4.4.0";
+ version = "4.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b5171e3798bf7e3fc5ea7072fe87324db67a4dd9f1192b037fed4cc3c1b7f455";
+ sha256 = "01fe1242e706375d7c942d206a30826bd9c0dffde99bfac627050cdc91f0d792";
};
nativeBuildInputs = [ pytest setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index c49d76705f79..5752bca4f66f 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -1,16 +1,19 @@
{ lib
, buildPythonPackage
+, fetchpatch
, fetchPypi
-, pythonOlder
, packaging
, pytest
, pytestCheckHook
+, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "pytest-doctestplus";
version = "0.11.2";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchPypi {
@@ -34,6 +37,15 @@ buildPythonPackage rec {
pytestCheckHook
];
+ patches = [
+ # Removal of distutils, https://github.com/astropy/pytest-doctestplus/pull/172
+ (fetchpatch {
+ name = "distutils-removal.patch";
+ url = "https://github.com/astropy/pytest-doctestplus/commit/ae2ee14cca0cde0fab355936995fa083529b00ff.patch";
+ sha256 = "sha256-uryKV7bWw2oz0glyh2lpGqtDPFvRTo8RmI1N1n15/d4=";
+ })
+ ];
+
disabledTests = [
# ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...]
# __main__.py: error: unrecognized arguments: --remote-data
@@ -49,6 +61,6 @@ buildPythonPackage rec {
description = "Pytest plugin with advanced doctest features";
homepage = "https://astropy.org";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index cbba86641c13..594a5efaa894 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
, setuptools-scm
, py
@@ -9,11 +10,13 @@
buildPythonPackage rec {
pname = "pytest-forked";
- version = "1.3.0";
+ version = "1.4.0";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca";
+ sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 819c0a14832f..9536325ade51 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -5,20 +5,26 @@
, pytest
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-httpx";
- version = "0.15.0";
+ version = "0.17.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Colin-b";
repo = "pytest_httpx";
rev = "v${version}";
- sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg";
+ sha256 = "sha256-cJRzjNIN9Fc8vcjmndW+akjxDSp+wFahY2MEslgXIwM=";
};
- buildInputs = [ pytest ];
+ buildInputs = [
+ pytest
+ ];
propagatedBuildInputs = [
httpx
@@ -29,12 +35,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "pytest_httpx" ];
+ pythonImportsCheck = [
+ "pytest_httpx"
+ ];
meta = with lib; {
description = "Send responses to httpx";
homepage = "https://github.com/Colin-b/pytest_httpx";
license = licenses.mit;
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ fab SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index a3f57ff40e7a..e5008af9ef2f 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -1,5 +1,5 @@
-{ buildPythonPackage
-, lib
+{ lib
+, buildPythonPackage
, fetchPypi
, werkzeug
}:
@@ -7,23 +7,28 @@
buildPythonPackage rec {
pname = "pytest-localserver";
version = "0.5.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761";
};
- propagatedBuildInputs = [ werkzeug ];
+ propagatedBuildInputs = [
+ werkzeug
+ ];
# all tests access network: does not work in sandbox
doCheck = false;
- pythonImportsCheck = [ "pytest_localserver" ];
+
+ pythonImportsCheck = [
+ "pytest_localserver"
+ ];
meta = with lib; {
description = "Plugin for the pytest testing framework to test server connections locally";
- homepage = "https://pypi.python.org/pypi/pytest-localserver";
+ homepage = "https://github.com/pytest-dev/pytest-localserver";
license = licenses.mit;
maintainers = with maintainers; [ siriobalmelli ];
};
}
-
diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix
new file mode 100644
index 000000000000..c626a1cfac9e
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-logdog/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-logdog";
+ version = "0.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "ods";
+ repo = pname;
+ rev = version;
+ hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I=";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ buildInputs = [
+ pytest
+ ];
+
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "pytest_logdog"
+ ];
+
+ meta = with lib; {
+ description = "Pytest plugin to test logging";
+ homepage = "https://github.com/ods/pytest-logdog";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix
index a49c958c3fcc..e40e0671bc03 100644
--- a/pkgs/development/python-modules/pytest-order/default.nix
+++ b/pkgs/development/python-modules/pytest-order/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytest-order";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-WZeiYrMSNO67Rh+anvJGh79zICm0mYRaQ5i2nttawyE=";
+ sha256 = "sha256-Xda5KfvX6qbQ7gdYb2XGI7q7Cv5ytIQ8XxUFXWs7Gx8=";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
index 734e0e64b31d..a2fe0c6f25c4 100644
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -1,20 +1,27 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, factory_boy, faker, numpy, importlib-metadata
-, pytestCheckHook, pytest-xdist
+{ lib
+, buildPythonPackage
+, factory_boy
+, faker
+, fetchFromGitHub
+, importlib-metadata
+, numpy
+, pytest-xdist
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-randomly";
- version = "3.10.1";
+ version = "3.10.3";
+ format = "setuptools";
disabled = pythonOlder "3.6";
- # fetch from GitHub as pypi tarball doesn't include tests
src = fetchFromGitHub {
repo = pname;
owner = "pytest-dev";
rev = version;
- sha256 = "10z7hsr8yd80sf5113i61p0g1c0nqkx7p4xi19v3d133f6vjbh3k";
+ sha256 = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
@@ -22,19 +29,27 @@ buildPythonPackage rec {
];
checkInputs = [
- pytestCheckHook
- pytest-xdist
- numpy
factory_boy
faker
+ numpy
+ pytest-xdist
+ pytestCheckHook
];
+
# needs special invocation, copied from tox.ini
- pytestFlagsArray = [ "-p" "no:randomly" ];
+ pytestFlagsArray = [
+ "-p"
+ "no:randomly"
+ ];
+
+ pythonImportsCheck = [
+ "pytest_randomly"
+ ];
meta = with lib; {
description = "Pytest plugin to randomly order tests and control random.seed";
homepage = "https://github.com/pytest-dev/pytest-randomly";
license = licenses.bsd3;
- maintainers = [ maintainers.sternenseemann ];
+ maintainers = with maintainers; [ sternenseemann ];
};
}
diff --git a/pkgs/development/python-modules/pytest-runner/2.nix b/pkgs/development/python-modules/pytest-runner/2.nix
deleted file mode 100644
index bea83146c37d..000000000000
--- a/pkgs/development/python-modules/pytest-runner/2.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:
-
-buildPythonPackage rec {
- pname = "pytest-runner";
- version = "5.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b";
- };
-
- nativeBuildInputs = [ setuptools-scm pytest ];
-
- postPatch = ''
- rm pytest.ini
- '';
-
- checkPhase = ''
- py.test tests
- '';
-
- # Fixture not found
- doCheck = false;
-
- meta = with lib; {
- description = "Invoke py.test as distutils command with dependency resolution";
- homepage = "https://github.com/pytest-dev/pytest-runner";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix
index 3b7a9f389ebd..cb58e101be7b 100644
--- a/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -1,23 +1,45 @@
-{ lib, buildPythonPackage, fetchPypi, packaging, pytest, setuptools-scm }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, packaging
+, pytest
+, setuptools-scm
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pytest-snapshot";
version = "0.8.0";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "cf84c88c3e0b4ae08ae797d9ccdc32715b64dd68b2da40f575db56956ed23326";
+ src = fetchFromGitHub {
+ owner = "joseph-roitman";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-xnfsB4wmsvqq5FfhLasSpxZh7+vhQsND6+Lxu0OuCvs=";
};
- nativeBuildInputs = [ setuptools-scm ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
- buildInputs = [ pytest ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- propagatedBuildInputs = [ packaging ];
+ buildInputs = [
+ pytest
+ ];
- # pypi does not contain tests and GitHub archive is not supported because setuptools-scm can't detect the version
- doCheck = false;
- pythonImportsCheck = [ "pytest_snapshot" ];
+ propagatedBuildInputs = [
+ packaging
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "pytest_snapshot"
+ ];
meta = with lib; {
description = "A plugin to enable snapshot testing with pytest";
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 40f67eb0b0ba..f504bd80868b 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -9,28 +9,40 @@
buildPythonPackage rec {
pname = "pytest-timeout";
- version = "1.4.2";
+ version = "2.0.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
+ sha256 = "sha256-pexOzt246nJpEYSFk9ZoWUEH55diHpf5Oh0dvG+7kIA=";
};
- buildInputs = [ pytest ];
+ buildInputs = [
+ pytest
+ ];
- checkInputs = [ pytestCheckHook pexpect pytest-cov ];
+ checkInputs = [
+ pytestCheckHook
+ pexpect
+ pytest-cov
+ ];
disabledTests = [
"test_suppresses_timeout_when_pdb_is_entered"
# Remove until https://github.com/pytest-dev/pytest/pull/7207 or similar
"test_suppresses_timeout_when_debugger_is_entered"
];
+
pytestFlagsArray = [
"-ra"
];
+ pythonImportsCheck = [
+ "pytest_timeout"
+ ];
+
meta = with lib; {
- description = "py.test plugin to abort hanging tests";
+ description = "Pytest plugin to abort hanging tests";
homepage = "https://github.com/pytest-dev/pytest-timeout/";
changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix
deleted file mode 100644
index 466d86f50f78..000000000000
--- a/pkgs/development/python-modules/pytest-xdist/1.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, execnet, pytest
-, setuptools-scm, pytest-forked, filelock, psutil, six, isPy3k }:
-
-buildPythonPackage rec {
- pname = "pytest-xdist";
- version = "1.34.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il";
- };
-
- nativeBuildInputs = [ setuptools-scm pytest ];
- checkInputs = [ pytest filelock ];
- propagatedBuildInputs = [ execnet pytest-forked psutil six ];
-
- # Encountered a memory leak
- # https://github.com/pytest-dev/pytest-xdist/issues/462
- doCheck = !isPy3k;
-
- checkPhase = ''
- # Excluded tests access file system
- py.test testing -k "not test_distribution_rsyncdirs_example \
- and not test_rsync_popen_with_path \
- and not test_popen_rsync_subdir \
- and not test_init_rsync_roots \
- and not test_rsyncignore"
- '';
-
- meta = with lib; {
- description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
- homepage = "https://github.com/pytest-dev/pytest-xdist";
- license = licenses.mit;
- maintainers = with maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index f71522a40dc6..fa1b0f63fabc 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pytest-xdist";
- version = "2.4.0";
+ version = "2.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9";
+ sha256 = "sha256-RYDeyj/wTdsqxT66Oddstd1e3qwFDLb7x2iw3XErTt8=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix
deleted file mode 100644
index 0a0ae571ba01..000000000000
--- a/pkgs/development/python-modules/pytest/4.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
-, setuptools-scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
-}:
-buildPythonPackage rec {
- version = "4.6.11";
- pname = "pytest";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353";
- };
-
- postPatch = ''
- substituteInPlace setup.py \
- --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0"
- '';
-
- checkInputs = [ hypothesis mock ];
- buildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
- ++ lib.optionals (!isPy3k) [ funcsigs ]
- ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
-
- doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
- checkPhase = ''
- runHook preCheck
-
- # don't test bash builtins
- rm testing/test_argcomplete.py
-
- # determinism - this test writes non deterministic bytecode
- rm -rf testing/test_assertrewrite.py
-
- PYTHONDONTWRITEBYTECODE=1 $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
- runHook postCheck
- '';
-
- # Remove .pytest_cache when using py.test in a Nix build
- setupHook = writeText "pytest-hook" ''
- pytestcachePhase() {
- find $out -name .pytest_cache -type d -exec rm -rf {} +
- }
-
- preDistPhases+=" pytestcachePhase"
-
- # pytest generates it's own bytecode files to improve assertion messages.
- # These files similar to cpython's bytecode files but are never laoded
- # by python interpreter directly. We remove them for a few reasons:
- # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
- # (file headers are generatedt by pytest directly and contain timestamps)
- # - files are not needed after tests are finished
- pytestRemoveBytecodePhase () {
- # suffix is defined at:
- # https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47
- find $out -name "*-PYTEST.py[co]" -delete
- }
- preDistPhases+=" pytestRemoveBytecodePhase"
- '';
-
- meta = with lib; {
- homepage = "https://docs.pytest.org";
- description = "Framework for writing tests";
- maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
- license = licenses.mit;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix
deleted file mode 100644
index ee04e3be429f..000000000000
--- a/pkgs/development/python-modules/pytest/5.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
-, atomicwrites
-, attrs
-, hypothesis
-, more-itertools
-, packaging
-, pathlib2
-, pluggy
-, py
-, pygments
-, setuptools
-, setuptools-scm
-, six
-, toml
-, wcwidth
-, writeText
-}:
-
-buildPythonPackage rec {
- version = "5.4.3";
- pname = "pytest";
-
- disabled = !isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr";
- };
-
- postPatch = ''
- substituteInPlace setup.py \
- --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0"
- '';
-
- checkInputs = [ hypothesis pygments ];
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [
- atomicwrites
- attrs
- more-itertools
- packaging
- pluggy
- py
- setuptools
- six
- toml
- wcwidth
- ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
-
- doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
-
- preCheck = ''
- # don't test bash builtins
- rm testing/test_argcomplete.py
- '';
-
- # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929
- checkPhase = ''
- runHook preCheck
- $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
- runHook postCheck
- '';
-
- # Remove .pytest_cache when using py.test in a Nix build
- setupHook = writeText "pytest-hook" ''
- pytestcachePhase() {
- find $out -name .pytest_cache -type d -exec rm -rf {} +
- }
- preDistPhases+=" pytestcachePhase"
-
- # pytest generates it's own bytecode files to improve assertion messages.
- # These files similar to cpython's bytecode files but are never laoded
- # by python interpreter directly. We remove them for a few reasons:
- # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
- # (file headers are generatedt by pytest directly and contain timestamps)
- # - files are not needed after tests are finished
- pytestRemoveBytecodePhase () {
- # suffix is defined at:
- # https://github.com/pytest-dev/pytest/blob/5.4.3/src/_pytest/assertion/rewrite.py#L42-L45
- find $out -name "*-pytest-*.py[co]" -delete
- }
- preDistPhases+=" pytestRemoveBytecodePhase"
- '';
-
- pythonImportsCheck = [
- "pytest"
- ];
-
- meta = with lib; {
- homepage = "https://docs.pytest.org";
- description = "Framework for writing tests";
- maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index ac036936b991..0b1bb2b02030 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,5 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
+, pythonAtLeast, fetchpatch
, atomicwrites
, attrs
, hypothesis
@@ -27,10 +28,13 @@ buildPythonPackage rec {
sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89";
};
- postPatch = ''
- substituteInPlace setup.cfg \
- --replace "pluggy>=0.12,<1.0.0a1" "pluggy>=0.23,<2.0"
- '';
+ patches = lib.optionals (pythonAtLeast "3.10") [
+ (fetchpatch {
+ # Fix test_errors_in_xfail_skip_expressions for Python 3.10.1, remove after 6.2.5
+ url = "https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a.patch";
+ sha256 = "0hsl3lww6bx5k99cp8gj0fy9rg02kcfbwiiwjx2y8vbhwd5ns41p";
+ })
+ ];
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix
new file mode 100644
index 000000000000..9cf5ffc63abf
--- /dev/null
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+
+, mailchecker
+, phonenumbers
+, python-dateutil
+, python-fsutil
+, python-slugify
+, pyyaml
+, ftfy
+, requests
+, six
+, toml
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "python-benedict";
+ version = "0.24.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "fabiocaccamo";
+ repo = pname;
+ rev = version;
+ hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0=";
+ };
+
+ propagatedBuildInputs = [
+ mailchecker
+ phonenumbers
+ python-dateutil
+ python-fsutil
+ python-slugify
+ pyyaml
+ ftfy
+ requests
+ six
+ toml
+ xmltodict
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Tests require network access
+ "test_from_base64_with_valid_url_valid_content"
+ "test_from_json_with_valid_url_valid_content"
+ "test_from_pickle_with_valid_url_valid_content"
+ "test_from_plist_with_valid_url_valid_content"
+ "test_from_query_string_with_valid_url_valid_content"
+ "test_from_toml_with_valid_url_valid_content"
+ "test_from_xml_with_valid_url_valid_content"
+ "test_from_yaml_with_valid_url_valid_content"
+ ];
+
+ pythonImportsCheck = [
+ "benedict"
+ ];
+
+ meta = with lib; {
+ description = "Module with keylist/keypath support";
+ homepage = "https://github.com/fabiocaccamo/python-benedict";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 9df9bf8a593b..074e5699e3d5 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -3,16 +3,21 @@
, fetchPypi
, docutils
, lockfile
-, mock
-, pytest_4
+, pytestCheckHook
, testscenarios
, testtools
, twine
+, python
+, pythonOlder
+, fetchpatch
}:
buildPythonPackage rec {
pname = "python-daemon";
version = "2.3.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -29,22 +34,39 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest_4
- mock
+ pytestCheckHook
testscenarios
testtools
];
- # tests disabled due to incompatibilities with testtools>=2.5.0
- checkPhase = ''
- runHook preCheck
- pytest -k ' \
- not detaches_process_context and \
- not standard_stream_file_descriptors and \
- not test_module_has_attribute and \
- not test_module_attribute_has_duck_type'
- runHook postCheck
- '';
+ patches = [
+ # Should be fixed in the next release
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/python-daemon-safe_hasattr.patch";
+ sha256 = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus=";
+ })
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/tests-remove-duplicate-mocking.patch";
+ sha256 = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8=";
+ })
+ ];
+
+ disabledTests = [
+ "begin_with_TestCase"
+ "changelog_TestCase"
+ "ChangeLogEntry"
+ "DaemonContext"
+ "file_descriptor"
+ "get_distribution_version_info_TestCase"
+ "InvalidFormatError_TestCase"
+ "make_year_range_TestCase"
+ "ModuleExceptions_TestCase"
+ "test_metaclass_not_called"
+ "test_passes_specified_object"
+ "test_returns_expected"
+ "value_TestCase"
+ "YearRange_TestCase"
+ ];
pythonImportsCheck = [
"daemon"
@@ -56,10 +78,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to implement a well-behaved Unix daemon process";
homepage = "https://pagure.io/python-daemon/";
- license = with licenses; [
- gpl3Plus
- asl20
- ];
+ # See "Copying" section in https://pagure.io/python-daemon/blob/main/f/README
+ license = with licenses; [ gpl3Plus asl20 ];
maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index baf385bb7d78..da9296387576 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "python-engineio";
- version = "4.3.0";
+ version = "4.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-engineio";
rev = "v${version}";
- sha256 = "sha256-ohNRtceh0bHBlnGSFUckG5KzoLY8Q1jvpFee7T78Vto=";
+ sha256 = "sha256-8595zivZmff0agFiQd5Qyd/T3BDxYcsb4RjA5AWXVNM=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
new file mode 100644
index 000000000000..17dbd579e841
--- /dev/null
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "python-fsutil";
+ version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "fabiocaccamo";
+ repo = pname;
+ rev = version;
+ hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "tests/test.py"
+ ];
+
+ disabledTests = [
+ # Tests require network access
+ "test_download_file"
+ "test_read_file_from_url"
+ ];
+
+ pythonImportsCheck = [
+ "fsutil"
+ ];
+
+ meta = with lib; {
+ description = "Module with file-system utilities";
+ homepage = "https://github.com/fabiocaccamo/python-fsutil";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index c3e35db28aa1..6853bddf54c1 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-gitlab";
- version = "3.0.0";
+ version = "3.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "89f82740b76820cf407cee9c43b75ca3ddb72f344f595902ee963837d7664986";
+ sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index cab28ef016d9..8ba5c7dd21fc 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -22,11 +22,11 @@
buildPythonApplication rec {
pname = "python-heatclient";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b53529eb73f08c384181a580efaa42293cc35e0e1ecc4b0bc14a5c7b202019bb";
+ sha256 = "b610748eb3f18f6bd762e0808accdf872308289a77c3b19ed2d8b9f306393a42";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index db79870ad591..3a8ad2188fc1 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -3,18 +3,21 @@
, fetchFromGitHub
, mock
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "python_http_client";
- version = "3.3.4";
+ version = "3.3.5";
format = "setuptools";
+ disabled = pythonOlder "3.8";
+
src = fetchFromGitHub {
owner = "sendgrid";
repo = "python-http-client";
rev = version;
- sha256 = "sha256-wTXHq+tC+rfvmDZIWvcGhQZqm6DxOmx50BsX0c6asec=";
+ sha256 = "sha256-VSrh6t9p7Xb8HqAwcuDSUD2Pj3NcXeg7ygKLG2MHFxk=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix
index 5654c2de3a85..c193cf7cd1ad 100644
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@@ -20,11 +20,11 @@
buildPythonApplication rec {
pname = "python-ironicclient";
- version = "4.9.0";
+ version = "4.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "99d45e914b2845731ac44fbfc63ae3e1bd52211396748797b588f2adc4b3f341";
+ sha256 = "8f3ad8ae1fc4df524ea05a458ad2567b58144e881807dbbb985e282902d732fd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 10ff6ddf6217..17c3cb07be36 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -2,7 +2,6 @@
, asyncclick
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, importlib-metadata
, poetry-core
, pytest-asyncio
@@ -14,7 +13,7 @@
buildPythonPackage rec {
pname = "python-kasa";
- version = "0.4.0";
+ version = "0.4.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -23,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
- sha256 = "08blmz5kg826l08pf6yrvl8gc8iz3hfb6wsfqih606dal08kdhdi";
+ sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak=";
};
nativeBuildInputs = [
@@ -42,26 +41,14 @@ buildPythonPackage rec {
voluptuous
];
- patches = [
- # Switch to poetry-core, https://github.com/python-kasa/python-kasa/pull/226
- (fetchpatch {
- name = "switch-to-poetry-core.patch";
- url = "https://github.com/python-kasa/python-kasa/commit/05c2a4a7dedbd60038e177b4d3f5ac5798544d11.patch";
- sha256 = "0cla11yqx88wj2s50s3xxxhv4nz4h3wd9pi12v79778hzdlg58rr";
- })
- ];
-
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'asyncclick = "^7"' 'asyncclick = "*"'
- '';
-
disabledTestPaths = [
# Skip the examples tests
"kasa/tests/test_readme_examples.py"
];
- pythonImportsCheck = [ "kasa" ];
+ pythonImportsCheck = [
+ "kasa"
+ ];
meta = with lib; {
description = "Python API for TP-Link Kasa Smarthome products";
diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix
index 8bf7ac5619a4..c9161e17e305 100644
--- a/pkgs/development/python-modules/python-keystoneclient/default.nix
+++ b/pkgs/development/python-modules/python-keystoneclient/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "python-keystoneclient";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fd09b7790ce53c20dc94318ec4d76e1cf71908aed59baeb4c7a61c17afd3aad5";
+ sha256 = "fc17ca9a1aa493104b496ba347f12507f271b5b6e819f4de4aef6574918aa071";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index 46900dd80e3d..24c51af4fb2e 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -24,21 +24,18 @@
buildPythonPackage rec {
pname = "python-miio";
- version = "0.5.8";
- disabled = pythonOlder "3.6";
+ version = "0.5.9.2";
+ disabled = pythonOlder "3.6.5";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-16XEah5rgem/L8A/zo1zPrifrU15VMk652rFLZcvjig=";
+ sha256 = "sha256-AFwarRhFknfwTSvSDGoWE+/mv1KUD2XnWK/xCBqrN4o=";
};
postPatch = ''
substituteInPlace pyproject.toml \
- --replace 'click = "^7"' 'click = "*"' \
- --replace 'croniter = "^0"' 'croniter = "*"' \
- --replace 'cryptography = "^3"' 'cryptography = "*"' \
- --replace 'defusedxml = "^0.6"' 'defusedxml = "*"'
+ --replace 'defusedxml = "^0"' 'defusedxml = "*"' \
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index ccac3e8b3cb2..3bf07bd1d509 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -1,8 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
-, pytest-cov
+, pytestCheckHook
, mock
, pyyaml
, six
@@ -11,31 +10,37 @@
buildPythonPackage rec {
pname = "python-multipart";
version = "0.0.5";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43";
};
- checkInputs = [
- pytest
- pytest-cov
- mock
- pyyaml
- ];
-
propagatedBuildInputs = [
six
];
- checkPhase = ''
- pytest
+ pythonImportsCheck = [
+ "multipart"
+ ];
+
+ preCheck = ''
+ # https://github.com/andrew-d/python-multipart/issues/41
+ substituteInPlace multipart/tests/test_multipart.py \
+ --replace "yaml.load" "yaml.safe_load"
'';
+ checkInputs = [
+ pytestCheckHook
+ mock
+ pyyaml
+ ];
+
meta = with lib; {
description = "A streaming multipart parser for Python";
homepage = "https://github.com/andrew-d/python-multipart";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index dc266e0e2075..4f484a845402 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-smarttub";
- version = "0.0.28";
+ version = "0.0.29";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mdz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dAwOi1hhjGhBGKEp5u3qW5WL1GLHBFac0drIc1Zk6ok=";
+ sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU=";
};
propagatedBuildInputs = [
@@ -38,6 +38,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyjwt~=2.1.0" "pyjwt>=2.1.0"
+ '';
+
pythonImportsCheck = [
"smarttub"
];
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 635f9cd13daf..0484a75eaeae 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "python-socketio";
- version = "5.5.0";
+ version = "5.5.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-socketio";
rev = "v${version}";
- sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg=";
+ sha256 = "sha256-mtXGSd7Y+frT22EL3QmiBNatwc6IrJqGBRfsQlD8LLk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 382eb3c5a314..939c4404d836 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
- version = "13.8.1";
+ version = "13.10";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-sGaR5Vw1lDJn7mNtmqcCs1eRVdLzLg4tbX8R8LXnJ/A=";
+ sha256 = "d2c555431821f4ace0c1b7ce12af41999f01b793b275dee131f1034d08c01e3e";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix
index fbd37155cdb7..3aa139b64b0c 100644
--- a/pkgs/development/python-modules/pythondialog/default.nix
+++ b/pkgs/development/python-modules/pythondialog/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pythondialog";
- version = "3.5.2";
+ version = "3.5.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "4fc11e95540d1d5dbe0a60cd3fb7787354df85ee4b5da21f708ea46cb47bf6d6";
+ sha256 = "b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
new file mode 100644
index 000000000000..bf9cb69721c4
--- /dev/null
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, attrs
+, cached-property
+, click
+, six
+, packaging
+, pytest-cov
+, pytest-timeout
+}:
+
+buildPythonPackage rec {
+ pname = "pythonfinder";
+ version = "1.2.9";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "sarugaku";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs=";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ cached-property
+ click
+ six
+ packaging
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ pytest-timeout
+ ];
+
+ pytestFlagsArray = [ "--no-cov" ];
+
+ # these tests invoke git in a subprocess and
+ # for some reason git can't be found even if included in checkInputs
+ disabledTests = [
+ "test_shims_are_kept"
+ "test_shims_are_removed"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/sarugaku/pythonfinder";
+ description = "Cross Platform Search Tool for Finding Pythons";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index fbfd0ba030cf..784f73f71811 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytibber";
- version = "0.21.6";
+ version = "0.22.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = version;
- hash = "sha256-zgiUXGso3bQ3pCD7r+VYHGBIihPwSfHibS2OZvPUb3Q=";
+ hash = "sha256-4eARNxVXtJtUC0oxym1kv5z+WkxgCHJZtN3MrIMA8+s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix
index f570a0a5c95a..df3e5da4c5ab 100644
--- a/pkgs/development/python-modules/pytorch/bin.nix
+++ b/pkgs/development/python-modules/pytorch/bin.nix
@@ -11,6 +11,7 @@
, patchelf
, pyyaml
, requests
+, setuptools
, typing-extensions
}:
@@ -41,6 +42,7 @@ in buildPythonPackage {
numpy
pyyaml
requests
+ setuptools
typing-extensions
];
@@ -72,7 +74,7 @@ in buildPythonPackage {
# https://docs.nvidia.com/cuda/eula/index.html
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
license = licenses.bsd3;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ junjihashimoto ];
};
}
diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix
index dd3e5dc1ae3e..61f1e59d09e8 100644
--- a/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -22,5 +22,30 @@ version : builtins.getAttr version {
url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg=";
};
+ x86_64-darwin-37 = {
+ name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE=";
+ };
+ x86_64-darwin-38 = {
+ name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I=";
+ };
+ x86_64-darwin-39 = {
+ name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw=";
+ };
+ aarch64-darwin-38 = {
+ name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
+ hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ=";
+ };
+ aarch64-darwin-39 = {
+ name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
+ hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY=";
+ };
};
}
diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix
index 3e50debd835c..1a2e6cc43ecb 100644
--- a/pkgs/development/python-modules/pytradfri/default.nix
+++ b/pkgs/development/python-modules/pytradfri/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pytradfri";
- version = "8.0.0";
+ version = "8.0.1";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "pytradfri";
rev = version;
- hash = "sha256-YnQUZcqSldtRqzMac5sPoSNDT+ifs3Jqek2CoDeobe8=";
+ hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix
index a357e45a5faf..6fb7d5d47283 100644
--- a/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pyturbojpeg";
- version = "1.6.3";
+ version = "1.6.5";
format = "setuptools";
src = fetchPypi {
pname = "PyTurboJPEG";
inherit version;
- sha256 = "sha256-5g9MQB7vpeuorVGExt0scHtLdrWlkuLOZMT38FhAsi4=";
+ hash = "sha256-l3eeD/WGiqVQ2E92WBV8eTRPVdtUnP7wP4brE8PPTkw=";
};
patches = [
diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix
index 3877db3254b7..2d738b8757b6 100644
--- a/pkgs/development/python-modules/pyutilib/default.nix
+++ b/pkgs/development/python-modules/pyutilib/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyutilib";
- version = "5.7.2";
+ version = "6.0.0";
src = fetchPypi {
pname = "PyUtilib";
inherit version;
- sha256 = "0bdb5hlj6kyb9m3xnpxzasfv5psnxfj21qx6md8ym8zkcqyq1qs5";
+ sha256 = "sha256-08FPjtkCioMbK/Ubird3brqH5mz8WKBrmcNZqqZA8EA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 211ba18ae612..7b8aef7ec30d 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -7,23 +7,21 @@
, fetchPypi
, future
, pycparser
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pyvex";
- version = "9.1.10913";
+ version = "9.1.11508";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EUgCyjD5ia5KQMvZWVAsXeKRjmSVE7tRRYH5u/Ozug0=";
+ hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME=";
};
- postPatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar'
- '';
-
- setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
-
propagatedBuildInputs = [
archinfo
bitstring
@@ -32,15 +30,29 @@ buildPythonPackage rec {
pycparser
];
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace vex/Makefile-gcc \
+ --replace '/usr/bin/ar' 'ar'
+ '';
+
+ setupPyBuildFlags = lib.optionals stdenv.isLinux [
+ "--plat-name"
+ "linux"
+ ];
+
preBuild = ''
export CC=${stdenv.cc.targetPrefix}cc
- substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
+ substituteInPlace pyvex_c/Makefile \
+ --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
'';
# No tests are available on PyPI, GitHub release has tests
# Switch to GitHub release after all angr parts are present
doCheck = false;
- pythonImportsCheck = [ "pyvex" ];
+
+ pythonImportsCheck = [
+ "pyvex"
+ ];
meta = with lib; {
description = "Python interface to libVEX and VEX IR";
diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix
index faec2c202632..f1dbd72cef0f 100644
--- a/pkgs/development/python-modules/pywayland/default.nix
+++ b/pkgs/development/python-modules/pywayland/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pywayland";
- version = "0.4.7";
+ version = "0.4.9";
src = fetchPypi {
inherit pname version;
- sha256 = "0IMNOPTmY22JCHccIVuZxDhVr41cDcKNkx8bp+5h2CU=";
+ sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix
index 43c50fa8cf2d..923e4b9a2809 100644
--- a/pkgs/development/python-modules/pywilight/default.nix
+++ b/pkgs/development/python-modules/pywilight/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pywilight";
- version = "0.0.73";
+ version = "0.0.74";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-8AYzAePLqCiz/EN6cJShGnrISijBpFHAU/u355f5IjY=";
+ sha256 = "sha256-patCdQ7qLEfy+RpH9T/Fa8ubI7QF6OmLzFUokZc5syQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix
index a35132ade3f6..901161d634fe 100644
--- a/pkgs/development/python-modules/pywlroots/default.nix
+++ b/pkgs/development/python-modules/pywlroots/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "pywlroots";
- version = "0.14.11";
+ version = "0.14.12";
src = fetchPypi {
inherit pname version;
- sha256 = "Ey1B3tx6UufxZs8I64vaoPSNC+4LGdcPuyKrLBHxZa8=";
+ sha256 = "80v1kuiYL3OdtDVJj0EvgrO9x1eN8xxUyRuI4Wb4giI=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 10073176aeb4..2c0e893b9c50 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -1,32 +1,32 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchFromGitHub
, cython
, libyaml
-, isPy27
, python
}:
buildPythonPackage rec {
pname = "PyYAML";
- version = "5.4.1.1";
+ version = "6.0";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "yaml";
repo = "pyyaml";
rev = version;
- sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8";
+ sha256 = "sha256-wcII32mRgRRmAgojntyxBMQkjvxU2jylCgVzlHAj2Xc=";
};
nativeBuildInputs = [ cython ];
buildInputs = [ libyaml ];
- checkPhase = let
- testdir = if isPy27 then "tests/lib" else "tests/lib3";
- in ''
+ checkPhase = ''
runHook preCheck
- PYTHONPATH="${testdir}:$PYTHONPATH" ${python.interpreter} -m test_all
+ PYTHONPATH="tests/lib:$PYTHONPATH" ${python.interpreter} -m test_all
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index 8fd24d957ca7..49c1c993e32e 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -1,9 +1,11 @@
{ lib
, attrs
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, fetchpatch
, httpx
, iso8601
+, poetry-core
, pydantic
, pyjwt
, pytest-asyncio
@@ -19,15 +21,21 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.20.9";
- format = "setuptools";
+ format = "pyproject";
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574";
+ src = fetchFromGitHub {
+ owner = "rigetti";
+ repo = "qcs-api-client-python";
+ rev = "v${version}";
+ hash = "sha256-bQ+5TZzjxGnNRsENEW/sN7sF6SOcgWl4MFtLekD0D+8=";
};
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
propagatedBuildInputs = [
attrs
httpx
@@ -46,15 +54,28 @@ buildPythonPackage rec {
respx
];
+ patches = [
+ # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2
+ (fetchpatch {
+ name = "switch-to-poetry-core.patch";
+ url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch";
+ sha256 = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ=";
+ })
+ ];
+
postPatch = ''
- substituteInPlace setup.py \
- --replace "attrs>=20.1.0,<21.0.0" "attrs" \
- --replace "httpx>=0.15.0,<0.16.0" "httpx" \
- --replace "pyjwt>=1.7.1,<2.0.0" "pyjwt"
+ substituteInPlace pyproject.toml \
+ --replace 'attrs = "^20.1.0"' 'attrs = "*"' \
+ --replace 'httpx = "^0.15.0"' 'httpx = "*"' \
+ --replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \
+ --replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \
+ --replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"'
'';
- # Project has no tests
- doCheck = false;
+ disabledTestPaths = [
+ # Test is outdated
+ "tests/test_client/test_client.py"
+ ];
pythonImportsCheck = [
"qcs_api_client"
diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix
deleted file mode 100644
index e22b3215e81f..000000000000
--- a/pkgs/development/python-modules/qpid-python/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchurl
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "qpid-python";
- version = "0.32";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "http://www.us.apache.org/dist/qpid/${version}/${pname}-${version}.tar.gz";
- sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4";
- };
-
- # needs a broker running and then ./qpid-python-test
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://qpid.apache.org/";
- description = "Python client implementation and AMQP conformance tests for Apache Qpid";
- license = licenses.asl20;
- };
-
-}
diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index ef981f19c664..4bcb536ad826 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtPy";
- version = "1.11.2";
+ version = "1.11.3";
src = fetchPypi {
inherit pname version;
- sha256 = "d6e4ae3a41f1fcb19762b58f35ad6dd443b4bdc867a4cb81ef10ccd85403c92b";
+ sha256 = "d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557";
};
# no concrete propagatedBuildInputs as multiple backends are supposed
diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix
index ed52c191c227..54df9bebb57c 100644
--- a/pkgs/development/python-modules/quamash/default.nix
+++ b/pkgs/development/python-modules/quamash/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest, isPy3k, pyqt5, pyqt ? pyqt5 }:
+{ lib, buildPythonPackage, fetchFromGitHub
+, pytest, isPy3k, pyqt5, pyqt ? pyqt5
+, fetchpatch
+}:
buildPythonPackage rec {
pname = "quamash";
@@ -14,6 +17,14 @@ buildPythonPackage rec {
sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa";
};
+ patches = [
+ # add 3.10 compatibility, merged remove on next update
+ (fetchpatch {
+ url = "https://github.com/harvimt/quamash/pull/126/commits/1e9047bec739dbc9d6ab337fc1a111a8b1090244.patch";
+ sha256 = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM=";
+ })
+ ];
+
propagatedBuildInputs = [ pyqt ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index b378392f7a97..e819cd24e99d 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -1,35 +1,37 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder
-# runtime dependencies
-, pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata
-# test suite dependencies
-, nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy
-# additional runtime dependencies are required on Python 2.x
-, pyopenssl, ndg-httpsclient, pyasn1
+{ lib
+, buildPythonPackage
+, factory_boy
+, faker
+, fetchPypi
+, httpretty
+, importlib-metadata
+, inflection
+, jsondate
+, mock
+, more-itertools
+, numpy
+, pandas
+, parameterized
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, requests
+, six
}:
buildPythonPackage rec {
pname = "quandl";
- version = "3.6.1";
- disabled = !isPy3k;
+ version = "3.7.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "Quandl";
- sha256 = "0jr69fqxhzdmkfh3fxz0yp2kks2hkmixrscjjf59q2l7irglwhc4";
+ sha256 = "6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c";
};
- checkInputs = [
- nose
- unittest2
- flake8
- httpretty
- mock
- jsondate
- parameterized
- faker
- factory_boy
- ];
-
propagatedBuildInputs = [
pandas
numpy
@@ -38,15 +40,23 @@ buildPythonPackage rec {
python-dateutil
six
more-itertools
- ] ++ lib.optionals (!isPy3k) [
- pyopenssl
- ndg-httpsclient
- pyasn1
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
- pythonImportsCheck = [ "quandl" ];
+ checkInputs = [
+ factory_boy
+ faker
+ httpretty
+ jsondate
+ mock
+ parameterized
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "quandl"
+ ];
meta = with lib; {
description = "Quandl Python client library";
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index ee2599a8fb75..f64faaf82ca7 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -4,7 +4,6 @@
, cmarkgfm
, docutils
, fetchPypi
-, future
, mock
, pygments
, pytestCheckHook
@@ -28,7 +27,6 @@ buildPythonPackage rec {
bleach
cmarkgfm
docutils
- future
pygments
];
@@ -37,6 +35,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1"
+ '';
+
pythonImportsCheck = [
"readme_renderer"
];
diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index 90024e732576..fc888c2379ee 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -1,22 +1,53 @@
-{ lib, buildPythonApplication, fetchPypi
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+
+# build deps
+, poetry-core
+
+# propagates
, cbor2
, python-dateutil
, pyyaml
, tomlkit
, u-msgpack-python
+
+# tested using
+, pytestCheckHook
}:
buildPythonApplication rec {
pname = "remarshal";
version = "0.14.0";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "16425aa1575a271dd3705d812b06276eeedc3ac557e7fd28e06822ad14cd0667";
+ src = fetchFromGitHub {
+ owner = "dbohdan";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256:nTM3jrPf0kGE15J+ZXBIt2+NGSW2a6VlZCKj70n5kHM=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "poetry.masonry.api" "poetry.core.masonry.api" \
+ --replace 'PyYAML = "^5.3"' 'PyYAML = "*"'
+ '';
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
propagatedBuildInputs = [
- pyyaml cbor2 python-dateutil tomlkit u-msgpack-python
+ cbor2
+ python-dateutil
+ pyyaml
+ tomlkit
+ u-msgpack-python
+ ];
+
+ checkInputs = [
+ pytestCheckHook
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix
deleted file mode 100644
index 2c51238e19b5..000000000000
--- a/pkgs/development/python-modules/repeated_test/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, unittest2
-, six
-}:
-
-buildPythonPackage rec {
- pname = "repeated_test";
- version = "1.0.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "65107444a4945668ab7be6d1a3e1814cee9b2cfc577e7c70381700b11b809d27";
- };
-
- buildInputs = [ unittest2 ];
- propagatedBuildInputs = [ six ];
-
- meta = with lib; {
- description = "A quick unittest-compatible framework for repeating a test function over many fixtures";
- homepage = "https://github.com/epsy/repeated_test";
- license = licenses.mit;
- };
-
-}
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index de2b799a051b..9fac4f0c2410 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.6.2";
+ version = "3.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "f0c4b47b012d893b0b9f5703cf6f01b5593714a3fc1e7dc73efbbfe26bb7e16a";
+ sha256 = "be4f05230eb17b9c9c61a180ab0c89c30112da2823c77807a2a5ddba19365865";
};
checkInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index 17a8191455ae..40bbb1aa6cb1 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "requests-kerberos";
- version = "0.13.0";
+ version = "0.14.0";
# tests are not present in the PyPI version
src = fetchFromGitHub {
owner = "requests";
repo = pname;
rev = "v${version}";
- sha256 = "0yvfg2cj3d10l8fd8kyal4hmpd7fd1c3bca13cj9ril5l573in76";
+ sha256 = "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3";
};
# avoid needing to package krb5
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index 3ad219025a92..0417154a4a31 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -1,38 +1,61 @@
{ lib
+, betamax
, buildPythonPackage
+, fetchpatch
, fetchPypi
-, requests
-, betamax
, mock
-, pytest
, pyopenssl
+, pytestCheckHook
+, requests
}:
buildPythonPackage rec {
pname = "requests-toolbelt";
version = "0.9.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
+ hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A=";
};
- checkInputs = [ pyopenssl betamax mock pytest ];
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ checkInputs = [
+ betamax
+ mock
+ pyopenssl
+ pytestCheckHook
+ ];
+
+ patches = [
+ (fetchpatch {
+ # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246
+ name = "fix-collections-abc-deprecation.patch";
+ url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch";
+ sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4=";
+ })
+ ];
+
+ disabledTests = [
+ # https://github.com/requests/toolbelt/issues/306
+ "test_no_content_length_header"
+ "test_read_file"
+ "test_reads_file_from_url_wrapper"
+ "test_x509_der"
+ "test_x509_pem"
+ ];
- checkPhase = ''
- # disabled tests access the network
- py.test tests -k "not test_no_content_length_header \
- and not test_read_file \
- and not test_reads_file_from_url_wrapper \
- and not test_x509_der \
- and not test_x509_pem"
- '';
+ pythonImportsCheck = [
+ "requests_toolbelt"
+ ];
- meta = {
- description = "A toolbelt of useful classes and functions to be used with python-requests";
+ meta = with lib; {
+ description = "Toolbelt of useful classes and functions to be used with requests";
homepage = "http://toolbelt.rtfd.org";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ matthiasbeyer ];
+ license = licenses.asl20;
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix
index 8b47183dcfd3..83d50cf1346c 100644
--- a/pkgs/development/python-modules/restfly/default.nix
+++ b/pkgs/development/python-modules/restfly/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "restfly";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "stevemcgrath";
repo = pname;
rev = version;
- sha256 = "sha256-T5NfG+Vuguh6xZ/Rdx3a1vMDgXPcl/OYhOkxb76yEXg=";
+ sha256 = "sha256-wWFf8LFZkwzbHX545tA5w2sB3ClL7eFuF+jGX0fSiSc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index b25b28eca943..9a4a0f13369e 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -5,18 +5,20 @@
, readme_renderer
, packaging
, pygments
-, mock
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "restview";
- version = "2.9.3";
+ version = "3.0.0";
format = "setuptools";
+ disabled = pythonOlder "3.6";
+
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-WVGqIYLnqao6uQbb0PDTPfj+k+ZjGKholknBIorXTNg=";
+ sha256 = "sha256-K5iWEKrtL9Qtpk9s3FOc8+5wzjcLy6hy23JCGtUV3R4=";
};
propagatedBuildInputs = [
@@ -27,7 +29,6 @@ buildPythonPackage rec {
];
checkInputs = [
- mock
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 6517d15df579..f6194970adbd 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rich";
- version = "10.16.1";
+ version = "11.0.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-smeRZTMIDbK9pZRRj42BGj8ifQw9bTTE90rGaV/Up/4=";
+ sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix
deleted file mode 100644
index 97eee2155a5e..000000000000
--- a/pkgs/development/python-modules/roboschool/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ lib
-, buildPythonPackage
-, isPy3k
-, python
-, fetchFromGitHub
-, fetchpatch
-, qtbase
-, boost
-, assimp
-, gym
-, bullet-roboschool
-, pkg-config
-, which
-}:
-
-buildPythonPackage rec {
- pname = "roboschool";
- version = "1.0.39";
-
- src = fetchFromGitHub {
- owner = "openai";
- repo = "roboschool";
- rev = version;
- sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh";
- };
-
- # fails to find boost_python for some reason
- disabled = !isPy3k;
-
- propagatedBuildInputs = [
- gym
- ];
-
- nativeBuildInputs = [
- pkg-config
- qtbase # needs the `moc` tool
- which
- ];
-
- buildInputs = [
- bullet-roboschool
- assimp
- qtbase
- boost
- ];
-
- dontWrapQtApps = true;
-
- NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}";
-
- patches = [
- # Remove kwarg that was removed in upstream gym
- # https://github.com/openai/roboschool/pull/180
- (fetchpatch {
- name = "remove-close-kwarg.patch";
- url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch";
- sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r";
- })
- ];
-
- preBuild = ''
- # First build the cpp dependencies
- cd roboschool/cpp-household
- make \
- MOC=moc \
- -j$NIX_BUILD_CORES
- cd ../..
- '';
-
- # Does a QT sanity check, but QT is not expected to work in isolation
- doCheck = false;
-
- meta = with lib; {
- description = "Open-source software for robot simulation, integrated with OpenAI Gym";
- homepage = "https://github.com/openai/roboschool";
- license = licenses.mit;
- maintainers = with maintainers; [ timokau ];
- };
-}
diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix
index 2a97993669f1..dff19589dcc4 100644
--- a/pkgs/development/python-modules/roombapy/default.nix
+++ b/pkgs/development/python-modules/roombapy/default.nix
@@ -37,6 +37,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ # hbmqtt was replaced by amqtt
+ substituteInPlace tests/test_roomba_integration.py \
+ --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker"
+ '';
+
disabledTestPaths = [
# Requires network access
"tests/test_discovery.py"
diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix
new file mode 100644
index 000000000000..205cefad6143
--- /dev/null
+++ b/pkgs/development/python-modules/rpi-bad-power/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+let
+ pname = "rpi-bad-power";
+ version = "0.1.0";
+in
+buildPythonPackage {
+ inherit pname version;
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "shenxn";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk";
+ };
+
+ pythonImportsCheck = [
+ "rpi_bad_power"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Python library to detect bad power supply on Raspberry Pi";
+ homepage = "https://github.com/shenxn/rpi-bad-power";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index e56aed2aeb7c..61a2f1e75605 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -3,11 +3,15 @@
, fetchFromGitHub
, plumbum
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "rpyc";
version = "5.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tomerfiliba";
@@ -16,17 +20,27 @@ buildPythonPackage rec {
sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1";
};
- propagatedBuildInputs = [ plumbum ];
+ propagatedBuildInputs = [
+ plumbum
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- # Disable tests that requires network access
disabledTests = [
+ # Disable tests that requires network access
"test_api"
"test_pruning"
"test_rpyc"
+ # Test is outdated
+ # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997)
+ "test_ssl_conenction"
+ ];
+
+ pythonImportsCheck = [
+ "rpyc"
];
- pythonImportsCheck = [ "rpyc" ];
meta = with lib; {
description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 2a30bd95f968..4b6774a4f9fa 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "ruamel-yaml";
- version = "0.17.16";
+ version = "0.17.17";
src = fetchPypi {
pname = "ruamel.yaml";
inherit version;
- sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33";
+ sha256 = "9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be";
};
# Tests use relative paths
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index e8a8bbea801b..22d7eb1a09f6 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "2021.11.0";
+ version = "2021.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3c23eac1fa5b685c9d507950b24f75929e8bcd1ea98b9a95cf2a9cb66ee6c9f5";
+ sha256 = "1a9ea7596663cda3a5dc6802f11eb468b397de35a8793750e9a98c65abd1a114";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/s3transfer/0_4.nix b/pkgs/development/python-modules/s3transfer/0_4.nix
deleted file mode 100644
index 8cfd324f00a5..000000000000
--- a/pkgs/development/python-modules/s3transfer/0_4.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib
-, fetchPypi
-, pythonOlder
-, buildPythonPackage
-, docutils
-, mock
-, nose
-, coverage
-, wheel
-, unittest2
-, botocore
-, futures ? null
-}:
-
-buildPythonPackage rec {
- pname = "s3transfer";
- version = "0.4.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
- };
-
- propagatedBuildInputs =
- [
- botocore
- ] ++ lib.optional (pythonOlder "3") futures;
-
- buildInputs = [
- docutils
- mock
- nose
- coverage
- wheel
- unittest2
- ];
-
- checkPhase = ''
- pushd s3transfer/tests
- nosetests -v unit/ functional/
- popd
- '';
-
- # version on pypi has no tests/ dir
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/boto/s3transfer";
- license = licenses.asl20;
- description = "A library for managing Amazon S3 transfers";
- };
-}
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 9ed50fb9e49e..3b07fe5b6d40 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -1,52 +1,53 @@
{ lib
-, fetchPypi
-, pythonOlder
+, botocore
, buildPythonPackage
, docutils
+, fetchFromGitHub
, mock
-, nose
-, coverage
+, pytestCheckHook
+, pythonOlder
+, stdenv
, wheel
-, unittest2
-, botocore
-, futures ? null
}:
buildPythonPackage rec {
pname = "s3transfer";
version = "0.5.0";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-UO2CPh3FhorUDI3JIHL3V6oOZToZKEXJSjtnb0pi2kw=";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "boto";
+ repo = pname;
+ rev = version;
+ hash = "sha256-0Dl7oKB2xxq/a8do3HgBUIGay88yOGBUdOGo+QCtnUE=";
};
- propagatedBuildInputs =
- [
- botocore
- ] ++ lib.optional (pythonOlder "3") futures;
-
- buildInputs = [
- docutils
- mock
- nose
- coverage
- wheel
- unittest2
- ];
-
- checkPhase = ''
- pushd s3transfer/tests
- nosetests -v unit/ functional/
- popd
- '';
-
- # version on pypi has no tests/ dir
- doCheck = false;
+ propagatedBuildInputs = [ botocore ];
+
+ buildInputs = [ docutils mock pytestCheckHook wheel ];
+
+ disabledTestPaths = [
+ # Requires network access
+ "tests/integration/test_copy.py"
+ "tests/integration/test_delete.py"
+ "tests/integration/test_download.py"
+ "tests/integration/test_processpool.py"
+ "tests/integration/test_s3transfer.py"
+ "tests/integration/test_upload.py"
+ ] ++
+ # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS
+ # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603.
+ # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork
+ lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ];
+
+ pythonImportsCheck = [ "s3transfer" ];
meta = with lib; {
+ description = "Library for managing Amazon S3 transfers";
homepage = "https://github.com/boto/s3transfer";
license = licenses.asl20;
- description = "A library for managing Amazon S3 transfers";
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 3df0a94cf8e5..1caa20b38511 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -12,22 +12,21 @@
, pandas
, pathos
, packaging
+, pythonOlder
}:
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.69.0";
+ version = "2.73.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "8e9051a44a82be07e32d83cfc12d724fd1cb76f83ade34cd9e69c45a8d37c676";
+ sha256 = "6735874a29aefc1e989a132a2e24945e5b0d057d8b297a2da695cf8421a78810";
};
- pythonImportsCheck = [
- "sagemaker"
- "sagemaker.lineage.visualizer"
- ];
-
propagatedBuildInputs = [
attrs
boto3
@@ -42,12 +41,17 @@ buildPythonPackage rec {
pandas
];
- doCheck = false;
-
postFixup = ''
[ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ]
'';
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "sagemaker"
+ "sagemaker.lineage.visualizer"
+ ];
+
meta = with lib; {
description = "Library for training and deploying machine learning models on Amazon SageMaker";
homepage = "https://github.com/aws/sagemaker-python-sdk/";
diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 0e9b563f0f70..f7d0e62ff15b 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
-, pytest_5
+, pytest
, numpy
, scipy
, matplotlib
@@ -24,7 +24,7 @@ buildPythonPackage rec {
buildInputs = [ opencl-headers ];
# Note: the 1.0.5 release should be compatible with pytest6, so this can
# be set back to 'pytest' at that point
- checkInputs = [ pytest_5 ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix
deleted file mode 100644
index f92b1f5a6ed7..000000000000
--- a/pkgs/development/python-modules/scandir/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, python, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
- pname = "scandir";
- version = "1.10.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
- };
-
- checkPhase = "${python.interpreter} test/run_tests.py";
-
- meta = with lib; {
- description = "A better directory iterator and faster os.walk()";
- homepage = "https://github.com/benhoyt/scandir";
- license = licenses.gpl3;
- maintainers = with maintainers; [ abbradar ];
- };
-}
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 66a5dc1d1475..bea5b766b5c9 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "schema-salad";
- version = "8.2.20211222191353";
+ version = "8.2.20220103095339";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "bae31897a9f5c16546081811728cc20296455dc805ffd0bac0064de6cbbcbf88";
+ sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix
index 3ace46489db5..dabe046e4861 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/pkgs/development/python-modules/schema/default.nix
@@ -1,28 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
+{ lib
+, buildPythonPackage
+, contextlib2
+, fetchPypi
+, mock
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
-
pname = "schema";
version = "0.7.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197";
+ hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc=";
};
- preConfigure = ''
- substituteInPlace requirements.txt --replace '==' '>='
- '';
+ propagatedBuildInputs = [
+ contextlib2
+ ];
- propagatedBuildInputs = [ contextlib2 ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
- checkInputs = [ pytest mock ];
- checkPhase = "pytest ./test_schema.py";
+ pythonImportsCheck = [
+ "schema"
+ ];
meta = with lib; {
description = "Library for validating Python data structures";
homepage = "https://github.com/keleshev/schema";
license = licenses.mit;
- maintainers = [ maintainers.tobim ];
+ maintainers = with maintainers; [ tobim ];
};
}
diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index 568643afbbf1..e490d5029434 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "scikit-survival";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d3573eb1df9d516c75994a8a82108b6c7a5ca7ea8a9af60b38f3f65c3e227fa7";
+ sha256 = "ba49325f6a31e8bdccfb88337aa85218d209e88a6a704e9c41ef13bf749e0f46";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index c96cf1b2ddd4..78ed6446f42a 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "scikits.odes";
- version = "2.6.2";
+ version = "2.6.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983";
+ sha256 = "9693da78d1bd0bd6af8db59aeaaed92a399c6af36960c6a0a665a2130eab59e7";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
new file mode 100644
index 000000000000..f4a024a46e99
--- /dev/null
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, asyncssh
+, buildPythonPackage
+, dulwich
+, fetchFromGitHub
+, fsspec
+, funcy
+, GitPython
+, pathspec
+, pygit2
+, pygtrie
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "scmrepo";
+ version = "0.0.7";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "iterative";
+ repo = pname;
+ rev = version;
+ hash = "sha256-tZsogqcfAqpSo9yOz4z0mgY9SVU1epPmcBuyLJsHLfY=";
+ };
+
+ propagatedBuildInputs = [
+ asyncssh
+ dulwich
+ fsspec
+ funcy
+ GitPython
+ pathspec
+ pygit2
+ pygtrie
+ ];
+
+ # Requires a running Docker instance
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "scmrepo"
+ ];
+
+ meta = with lib; {
+ description = "SCM wrapper and fsspec filesystem";
+ homepage = "https://github.com/iterative/scmrepo";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index dc05f5579817..c26ec74ac310 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -86,9 +86,10 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";
- # Disable doctest plugin because it causes pytest to hang
preCheck = ''
- substituteInPlace pytest.ini --replace "--doctest-modules" ""
+ # Disable doctest plugin because it causes pytest to hang
+ substituteInPlace pytest.ini \
+ --replace "--doctest-modules" ""
'';
disabledTestPaths = [
@@ -111,10 +112,12 @@ buildPythonPackage rec {
"test_custom_loop_asyncio"
"test_custom_loop_asyncio_deferred_signal"
"FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
+ "test_timeout_download_from_spider_nodata_rcvd"
# Fails with AssertionError
"test_peek_fifo"
"test_peek_one_element"
"test_peek_lifo"
+ "test_callback_kwargs"
] ++ lib.optionals stdenv.isDarwin [
"test_xmliter_encoding"
"test_download"
@@ -126,7 +129,9 @@ buildPythonPackage rec {
install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
'';
- pythonImportsCheck = [ "scrapy" ];
+ pythonImportsCheck = [
+ "scrapy"
+ ];
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 1ade4b8ea1de..90caa943ebde 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "screenlogicpy";
- version = "0.5.3";
+ version = "0.5.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "dieselrabbit";
repo = pname;
rev = "v${version}";
- sha256 = "1ic19l0xr2wlnc8q6nhvv747k0f4j9k94ix14zkrwpp9nl09sm8j";
+ sha256 = "0r9227s4v17jm5n0j31ssnak9f5p7xfvz4r1fwy61286is3j5gbb";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix
deleted file mode 100644
index 378be5be3130..000000000000
--- a/pkgs/development/python-modules/secretstorage/2.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
-
-buildPythonPackage rec {
- pname = "secretstorage";
- version = "2.3.1";
-
- src = fetchPypi {
- pname = "SecretStorage";
- inherit version;
- sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
- };
-
- propagatedBuildInputs = [ cryptography dbus-python ];
-
- # Needs a D-Bus Sesison
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/mitya57/secretstorage";
- description = "Python bindings to FreeDesktop.org Secret Service API";
- license = licenses.bsd3;
- maintainers = with maintainers; [ orivej ];
- };
-}
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index cb4578671b98..a86b51c005ba 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,30 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytest-cov
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "semver";
version = "2.13.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-semver";
repo = "python-semver";
rev = version;
- sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
+ hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
};
checkInputs = [
- pytest-cov
pytestCheckHook
];
- # Confuses source vs dist imports in pytest
- preCheck = "rm -r dist";
+ postPatch = ''
+ sed -i "/--cov/d" setup.cfg
+ sed -i "/--no-cov-on-fail/d" setup.cfg
+ '';
+
+ preCheck = ''
+ # Confuses source vs dist imports in pytest
+ rm -r dist
+ '';
- pythonImportsCheck = [ "semver" ];
+ disabledTestPaths = [
+ # Don't test the documentation
+ "docs/*.rst"
+ ];
+
+ pythonImportsCheck = [
+ "semver"
+ ];
meta = with lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
index b71c25a283d0..2ba415adda0d 100644
--- a/pkgs/development/python-modules/sendgrid/default.nix
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -4,6 +4,7 @@
, flask
, pytestCheckHook
, python-http-client
+, pythonOlder
, pyyaml
, starkbank-ecdsa
, werkzeug
@@ -11,14 +12,16 @@
buildPythonPackage rec {
pname = "sendgrid";
- version = "6.9.3";
+ version = "6.9.4";
format = "setuptools";
+ disabled = pythonOlder "3.6";
+
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
rev = version;
- sha256 = "sha256-/4Wk+1zAFwK+FxRhABQBha43/zapgPDfTFGrPJjXA7s=";
+ sha256 = "sha256-xNd0IPhaVw4X6URsg6hrDJhxmBRWam4bqgLN0uvMUxI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix
index 8d73407c9802..31ae4879e264 100644
--- a/pkgs/development/python-modules/sense-energy/default.nix
+++ b/pkgs/development/python-modules/sense-energy/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "sense-energy";
- version = "0.9.3";
+ version = "0.9.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "scottbonline";
repo = "sense";
rev = version;
- sha256 = "sha256-LUM7SP03U3mRxCTjgxPRXh/ZLz15R04zBWOxLKnan98=";
+ hash = "sha256-A4FSL+T2tWGEYmjOFsf99Sn17IT7HP7/ILQjUiPUl0A=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sentinels/default.nix b/pkgs/development/python-modules/sentinels/default.nix
new file mode 100644
index 000000000000..17c2c94a30ff
--- /dev/null
+++ b/pkgs/development/python-modules/sentinels/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, setuptools
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "sentinels";
+ version = "1.0.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1cglkxph47pki4db4kjx5g4ikxp2milqdlcjgqwmx4p1gx6p1q3v";
+ };
+
+ propagatedBuildInputs = [
+ setuptools
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "sentinels" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/vmalloc/sentinels/";
+ description = "Various objects to denote special meanings in python";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 0d06fa96563b..a59ec10be037 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -40,14 +40,14 @@
buildPythonPackage rec {
pname = "sentry-sdk";
- version = "1.5.1";
+ version = "1.5.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-python";
rev = version;
- sha256 = "sha256-vQ5zeAscPMQH3L+Ogj50IZZp2pBoYaxHzvcXakaoC4k=";
+ sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix
index 2a8267710a09..d3cc7e9c633b 100644
--- a/pkgs/development/python-modules/serverlessrepo/default.nix
+++ b/pkgs/development/python-modules/serverlessrepo/default.nix
@@ -1,16 +1,20 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
, boto3
, six
, pyyaml
, mock
+, pythonOlder
}:
buildPythonPackage rec {
pname = "serverlessrepo";
version = "0.1.10";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -23,12 +27,25 @@ buildPythonPackage rec {
pyyaml
];
- checkInputs = [ pytest mock ];
+ checkInputs = [
+ pytestCheckHook
+ mock
+ ];
- checkPhase = ''
- pytest tests/unit
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyyaml~=5.1" "pyyaml" \
+ --replace "boto3~=1.9, >=1.9.56" "boto3"
'';
+ pytestFlagsArray = [
+ "tests/unit"
+ ];
+
+ pythonImportsCheck = [
+ "serverlessrepo"
+ ];
+
meta = with lib; {
homepage = "https://github.com/awslabs/aws-serverlessrepo-python";
description = "Helpers for working with the AWS Serverless Application Repository";
@@ -36,7 +53,7 @@ buildPythonPackage rec {
A Python library with convenience helpers for working with the
AWS Serverless Application Repository.
'';
- license = lib.licenses.asl20;
+ license = licenses.asl20;
maintainers = with maintainers; [ dhkl ];
};
}
diff --git a/pkgs/development/python-modules/setuptools-scm/2.nix b/pkgs/development/python-modules/setuptools-scm/2.nix
deleted file mode 100644
index 4cf6f16fedfb..000000000000
--- a/pkgs/development/python-modules/setuptools-scm/2.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, toml }:
-
-buildPythonPackage rec {
- pname = "setuptools_scm";
- version = "5.0.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-g6DO3TRJ45RjB4EaTHudicS1/UZKL7XuzNCluxWK5cg=";
- };
-
- propagatedBuildInputs = [ toml ];
-
- # Requires pytest, circular dependency
- doCheck = false;
- pythonImportsCheck = [ "setuptools_scm" ];
-
- meta = with lib; {
- homepage = "https://github.com/pypa/setuptools_scm/";
- description = "Handles managing your python package versions in scm metadata";
- license = licenses.mit;
- maintainers = with maintainers; [ SuperSandro2000 ];
- };
-}
diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix
deleted file mode 100644
index ca70a1061512..000000000000
--- a/pkgs/development/python-modules/setuptools/44.0.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, python
-, bootstrapped-pip
-, lib
-, pipInstallHook
-, setuptoolsBuildHook
-}:
-
-let
- pname = "setuptools";
- version = "44.0.0";
-
- # Create an sdist of setuptools
- sdist = stdenv.mkDerivation rec {
- name = "${pname}-${version}-sdist.tar.gz";
-
- src = fetchFromGitHub {
- owner = "pypa";
- repo = pname;
- rev = "v${version}";
- sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
- name = "${pname}-${version}-source";
- };
-
- patches = [
- ./tag-date.patch
- ];
-
- buildPhase = ''
- ${python.pythonForBuild.interpreter} bootstrap.py
- ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
-
- # Here we untar the sdist and retar it in order to control the timestamps
- # of all the files included
- tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
- tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" ${pname}-${version}.post0
- '';
-
- installPhase = ''
- echo "Moving sdist..."
- mv dist/${name} $out
- '';
- };
-in buildPythonPackage rec {
- inherit pname version;
- # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly.
- # Instead, we override it to remove setuptools to avoid a circular dependency.
- # The same is done for pip and the pipInstallHook.
- format = "other";
-
- src = sdist;
-
- nativeBuildInputs = [
- bootstrapped-pip
- (pipInstallHook.override{pip=null;})
- (setuptoolsBuildHook.override{setuptools=null; wheel=null;})
- ];
-
- preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
- export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
- '';
-
- pipInstallFlags = [ "--ignore-installed" ];
-
- # Adds setuptools to nativeBuildInputs causing infinite recursion.
- catchConflicts = false;
-
- # Requires pytest, causing infinite recursion.
- doCheck = false;
-
- meta = with lib; {
- description = "Utilities to facilitate the installation of Python packages";
- homepage = "https://pypi.python.org/pypi/setuptools";
- license = with licenses; [ psfl zpl20 ];
- platforms = python.meta.platforms;
- priority = 10;
- };
-}
diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 8b378e844e43..772b38be30f2 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -5,16 +5,20 @@
, colorama
, requests
, setuptools
+, pythonOlder
, XlsxWriter
}:
buildPythonPackage rec {
pname = "shodan";
- version = "1.26.0";
+ version = "1.26.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "4f2ee19bdcad41a5f4618c8e7e1759f62c337cc2214416b53ad3d0c04a1146bc";
+ sha256 = "sha256-8oJ7QNaRiYjvn18W3LihM4OqrhooRYmPcBLqyJBru4c=";
};
propagatedBuildInputs = [
@@ -27,7 +31,10 @@ buildPythonPackage rec {
# The tests require a shodan api key, so skip them.
doCheck = false;
- pythonImportsCheck = [ "shodan" ];
+
+ pythonImportsCheck = [
+ "shodan"
+ ];
meta = with lib; {
description = "Python library and command-line utility for Shodan";
diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix
new file mode 100644
index 000000000000..efac8148a72a
--- /dev/null
+++ b/pkgs/development/python-modules/shtab/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "shtab";
+ version = "1.5.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "iterative";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Wuc4m3VdOGEcevYXUpbL4gTvyW9t13pj57zPYdqx0UY=";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ checkInputs = [
+ pytest-timeout
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" ""
+ '';
+
+ disabledTests = [
+ # bash tests are failing
+ "bash"
+ ];
+
+ pythonImportsCheck = [
+ "shtab"
+ ];
+
+ meta = with lib; {
+ description = "Module for shell tab completion of Python CLI applications";
+ homepage = "https://docs.iterative.ai/shtab/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/sigrok/default.nix b/pkgs/development/python-modules/sigrok/default.nix
new file mode 100644
index 000000000000..b8b925ba6b16
--- /dev/null
+++ b/pkgs/development/python-modules/sigrok/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, libsigrok
+, toPythonModule
+, python
+, autoreconfHook
+, pythonImportsCheckHook
+, pythonCatchConflictsHook
+, swig
+, setuptools
+, numpy
+, pygobject3
+}:
+
+# build libsigrok plus its Python bindings. Unfortunately it does not appear
+# to be possible to build them separately, at least not easily.
+toPythonModule ((libsigrok.override {
+ inherit python;
+}).overrideAttrs (orig: {
+ pname = "${python.libPrefix}-sigrok";
+
+ patches = orig.patches or [] ++ [
+ # Makes libsigrok install the bindings into site-packages properly (like
+ # we expect) instead of making a version-specific *.egg subdirectory.
+ ./python-install.patch
+ ];
+
+ nativeBuildInputs = orig.nativeBuildInputs or [] ++ [
+ autoreconfHook
+ setuptools
+ swig
+ numpy
+ ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+ pythonImportsCheckHook
+ pythonCatchConflictsHook
+ ];
+
+ buildInputs = orig.buildInputs or [] ++ [
+ pygobject3 # makes headers available the configure script checks for
+ ];
+
+ propagatedBuildInputs = orig.propagatedBuildInputs or [] ++ [
+ pygobject3
+ numpy
+ ];
+
+ postInstall = ''
+ ${orig.postInstall or ""}
+
+ # for pythonImportsCheck
+ export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
+ '';
+
+ pythonImportsCheck = [ "sigrok" "sigrok.core" ];
+
+ meta = orig.meta // {
+ description = "Python bindings for libsigrok";
+ maintainers = orig.meta.maintainers ++ [
+ lib.maintainers.sternenseemann
+ ];
+ };
+}))
diff --git a/pkgs/development/python-modules/sigrok/python-install.patch b/pkgs/development/python-modules/sigrok/python-install.patch
new file mode 100644
index 000000000000..9c25eab6f39a
--- /dev/null
+++ b/pkgs/development/python-modules/sigrok/python-install.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.am b/Makefile.am
+index 280cf64d..e10eb79f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -888,8 +888,9 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
+
+ python-install:
+ $(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
+- destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--root=$$destdir"} \
+- --prefix "$(prefix)" --exec-prefix "$(exec_prefix)"
++ destdir='$(DESTDIR)'; $(setup_py) install --root=$${destdir:-/} \
++ --prefix "$(prefix)" --exec-prefix "$(exec_prefix)" \
++ --single-version-externally-managed
+
+ python-clean:
+ -$(AM_V_at)rm -f $(PDIR)/timestamp
diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix
index b61e64684c86..49ba916b481c 100644
--- a/pkgs/development/python-modules/sigtools/default.nix
+++ b/pkgs/development/python-modules/sigtools/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, repeated_test
, sphinx
, mock
, coverage
@@ -19,11 +18,15 @@ buildPythonPackage rec {
sha256 = "e7789628ec0d02e421bca76532b0d5da149f96f09e7ed4a5cbf318624b75e949";
};
- buildInputs = [ repeated_test sphinx mock coverage unittest2 ];
propagatedBuildInputs = [ funcsigs six ];
patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py'';
+ # repeated_test no longer exists in nixpkgs
+ # Also see: https://github.com/epsy/sigtools/issues/26
+ doCheck = false;
+ checkInputs = [ sphinx mock coverage unittest2 ];
+
meta = with lib; {
description = "Utilities for working with 3.3's inspect.Signature objects.";
homepage = "https://pypi.python.org/pypi/sigtools";
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index 6467dc964ef3..a296a721a8e0 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "simpleeval";
- version = "0.9.11";
+ version = "0.9.12";
format = "pyproject";
src = fetchFromGitHub {
owner = "danthedeckie";
repo = pname;
rev = version;
- sha256 = "111w76mahbf3lm2p72dkqp5fhwg7nvnwm4l078dgsgkixssjazi7";
+ sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 9604d47c4e2f..5cd8136f84ef 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "sip";
- version = "6.1.1";
+ version = "6.5.0";
src = fetchPypi {
pname = "sip";
inherit version;
- sha256 = "083ykzg7zbvrfrg3ram2vx93zrmhpm817kf9bkhw8r6pzkr5mljj";
+ sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734";
};
propagatedBuildInputs = [ packaging toml ];
diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix
index a9364ad0d1f2..dbe24923bbf6 100644
--- a/pkgs/development/python-modules/smart-meter-texas/default.nix
+++ b/pkgs/development/python-modules/smart-meter-texas/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "smart-meter-texas";
- version = "0.4.7";
+ version = "0.5.0";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "grahamwetzler";
repo = "smart-meter-texas";
rev = "v${version}";
- sha256 = "1hfvv3kpkc7i9mn58bjgvwjj0mi2syr8fv4r8bwbhq5sailma27j";
+ sha256 = "1f5blmz3w549qjqn5xmdk1fx2pqd76hnlc9p439r7yc473nhw69w";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index c157a6a2132a..d13fbfb78893 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.7.2";
+ version = "2.7.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "b2f8f360750eefa98be09ff53c130381646f8dfc8c6e4a705387676210ff8578";
+ sha256 = "026562392d8733bdfaddcd5ec1537a139940df46a3a225849a36c71c1bf3e61c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix
new file mode 100644
index 000000000000..2842e3751732
--- /dev/null
+++ b/pkgs/development/python-modules/socketio-client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, requests
+, six
+, websocket-client
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "socketio-client";
+ version = "0.7.2";
+
+ src = fetchFromGitHub {
+ owner = "invisibleroads";
+ repo = "socketio-client";
+ rev = version;
+ sha256 = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho=";
+ };
+
+ propagatedBuildInputs = [
+ six
+ websocket-client
+ requests
+ ];
+
+ # Perform networking tests.
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "socketIO_client"
+ ];
+
+ meta = with lib; {
+ description = "A socket.io client library for protocol 1.x";
+ homepage = "https://github.com/invisibleroads/socketIO-client";
+ license = licenses.mit;
+ maintainers = with maintainers; [ raitobezarius ];
+ };
+}
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index df9a06aec14c..1a7747e2c2ec 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.25.2";
+ version = "0.25.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
- sha256 = "sha256-Bu9RtzvQVDPekIzkVvcDkTs5Z+IDx6lSBCMv5zs8gNA=";
+ sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index 8701fa98e67d..e332d0defd73 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -1,22 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, regex
+}:
buildPythonPackage rec {
- pname = "SoMaJo";
- version = "2.1.6";
- disabled = !isPy3k;
+ pname = "somajo";
+ version = "2.2.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tsproisl";
- repo = pname;
+ repo = "SoMaJo";
rev = "v${version}";
- sha256 = "1q88x05729qdnl1gbahisjk3s97wha0b5dj3n63kq2qyvyy0929s";
+ sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg";
};
- propagatedBuildInputs = [ regex ];
+ propagatedBuildInputs = [
+ regex
+ ];
# loops forever
doCheck = !stdenv.isDarwin;
+ pythonImportsCheck = [
+ "somajo"
+ ];
+
meta = with lib; {
description = "Tokenizer and sentence splitter for German and English web texts";
homepage = "https://github.com/tsproisl/SoMaJo";
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 743bd4d83c8f..bc39bb998e8e 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "sopel";
- version = "7.1.6";
+ version = "7.1.7";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "ebd3b2aa9230835f8a68ea7f5a10324ddf35d70d89a9c92c8cba81c558565efb";
+ sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 036f91614b1b..81f99d76d6ca 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, isPy27
@@ -10,12 +11,12 @@
buildPythonPackage rec {
pname = "sounddevice";
- version = "0.4.3";
+ version = "0.4.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "f1667a7467b65fac4c4ebf668b4e9698eb7333fc3d32bc3c7ec9839ea7cb6c20";
+ sha256 = "sha256-9pD1qkGKViaMe9vJfWl8ha3QE0xcedRLiirXobhdp4k=";
};
propagatedBuildInputs = [ cffi numpy portaudio ];
@@ -28,7 +29,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./fix-portaudio-library-path.patch;
- portaudio = "${portaudio}/lib/libportaudio.so.2";
+ portaudio = "${portaudio}/lib/libportaudio${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix
new file mode 100644
index 000000000000..7e4d572e1812
--- /dev/null
+++ b/pkgs/development/python-modules/spacy-loggers/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, callPackage
+, fetchPypi
+, buildPythonPackage
+, wandb
+, wasabi
+}:
+
+buildPythonPackage rec {
+ pname = "spacy-loggers";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-F9DiSbLmxlRsSfxlYaCmhfkajtvySlsrd1nq1EPHRlQ=";
+ };
+
+ propagatedBuildInputs = [
+ wandb
+ wasabi
+ ];
+
+ pythonImportsCheck = [ "spacy_loggers" ];
+
+ # skipping the checks, becaus it requires a cycle dependency to spacy as well.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Logging utilities for spaCy";
+ homepage = "https://github.com/explosion/spacy-loggers";
+ license = licenses.mit;
+ maintainers = with maintainers; [ stunkymonkey ];
+ };
+}
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 0d095cfef07e..05561e995a5c 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -25,17 +25,19 @@
, python
, tqdm
, typing-extensions
+, spacy-loggers
+, langcodes
}:
buildPythonPackage rec {
pname = "spacy";
- version = "3.2.0";
+ version = "3.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3";
+ sha256 = "sha256-9uusURYndAqMorEXuR71UVyPCy+xF6aevgHQEN1PxTw=";
};
propagatedBuildInputs = [
@@ -58,6 +60,8 @@ buildPythonPackage rec {
tqdm
typer
wasabi
+ spacy-loggers
+ langcodes
] ++ lib.optional (pythonOlder "3.8") typing-extensions;
checkInputs = [
diff --git a/pkgs/development/python-modules/speaklater3/default.nix b/pkgs/development/python-modules/speaklater3/default.nix
new file mode 100644
index 000000000000..60c4c99fd3a2
--- /dev/null
+++ b/pkgs/development/python-modules/speaklater3/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "speaklater3";
+ version = "1.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI=";
+ };
+
+ pythonImportsCheck = [ "speaklater" ];
+
+ meta = with lib; {
+ description = "Implements a lazy string for python useful for use with gettext";
+ homepage = "https://github.com/mitsuhiko/speaklater";
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
index f5cf0fbd3b65..0dd855fee2ae 100644
--- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
+++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "sphinx-inline-tabs";
- version = "2021.08.17.beta10";
+ version = "2022.01.02.beta11";
format = "flit";
src = fetchFromGitHub {
owner = "pradyunsg";
repo = "sphinx-inline-tabs";
rev = version;
- sha256 = "sha256-T3OqK0eXNiBs2zQURCSPLc8aIyf2an32UyDh4qSmxQ4=";
+ sha256 = "sha256-k2nOidUk87EZbFsqQ7zr/4eHk+T7wUOYimjbllfneUM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix
deleted file mode 100644
index 0424b9b4c39b..000000000000
--- a/pkgs/development/python-modules/sphinx/2.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, simplejson
-, mock
-, glibcLocales
-, html5lib
-, pythonOlder
-, enum34
-, python
-, docutils
-, jinja2
-, pygments
-, alabaster
-, Babel
-, snowballstemmer
-, six
-, sqlalchemy
-, whoosh
-, imagesize
-, requests
-, typing
-, sphinxcontrib-websupport
-, setuptools
-}:
-
-buildPythonPackage rec {
- pname = "sphinx";
- version = "1.8.5";
- src = fetchPypi {
- pname = "Sphinx";
- inherit version;
- sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08";
- };
- LC_ALL = "en_US.UTF-8";
-
- checkInputs = [ pytest ];
- buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
- # Disable two tests that require network access.
- checkPhase = ''
- cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
- '';
- propagatedBuildInputs = [
- docutils
- jinja2
- pygments
- alabaster
- Babel
- setuptools
- snowballstemmer
- six
- sphinxcontrib-websupport
- sqlalchemy
- whoosh
- imagesize
- requests
- ] ++ lib.optional (pythonOlder "3.5") typing;
-
- # Lots of tests. Needs network as well at some point.
- doCheck = false;
-
- patches = [
- # Since pygments 2.5, PythonLexer refers to python3. If we want to use
- # python2, we need to explicitly specify Python2Lexer.
- # Not upstreamed since there doesn't seem to be any upstream maintenance
- # branch for 1.8 (and this patch doesn't make any sense for 2.x).
- ./python2-lexer.patch
- ];
- # https://github.com/NixOS/nixpkgs/issues/22501
- # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
- postPatch = ''
- substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""
- '';
-
- meta = {
- description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
- homepage = "http://sphinx.pocoo.org/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ ];
- };
-}
diff --git a/pkgs/development/python-modules/sphinx/python2-lexer.patch b/pkgs/development/python-modules/sphinx/python2-lexer.patch
deleted file mode 100644
index cf4a243315a2..000000000000
--- a/pkgs/development/python-modules/sphinx/python2-lexer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
-index ac2bd1b06..63ca52de2 100644
---- a/sphinx/highlighting.py
-+++ b/sphinx/highlighting.py
-@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
- from pygments.formatters import HtmlFormatter, LatexFormatter
- from pygments.lexer import Lexer # NOQA
- from pygments.lexers import get_lexer_by_name, guess_lexer
--from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
-+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
- CLexer, TextLexer, RstLexer
- from pygments.styles import get_style_by_name
- from pygments.util import ClassNotFound
-@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
-
- lexers = dict(
- none = TextLexer(stripnl=False),
-- python = PythonLexer(stripnl=False),
-+ python = Python2Lexer(stripnl=False),
- python3 = Python3Lexer(stripnl=False),
- pycon = PythonConsoleLexer(stripnl=False),
- pycon3 = PythonConsoleLexer(python3=True, stripnl=False),
diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix
deleted file mode 100644
index b1bdf6a0dff6..000000000000
--- a/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, six
-}:
-
-buildPythonPackage rec {
- pname = "sphinxcontrib-websupport";
- version = "1.1.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc";
- };
-
- propagatedBuildInputs = [ six ];
-
- doCheck = false;
-
- meta = {
- description = "Sphinx API for Web Apps";
- homepage = "http://sphinx-doc.org/";
- license = lib.licenses.bsd2;
- };
-}
diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix
index 65e382ce30d1..71dbf63bda0f 100644
--- a/pkgs/development/python-modules/spyse-python/default.nix
+++ b/pkgs/development/python-modules/spyse-python/default.nix
@@ -11,6 +11,7 @@
buildPythonPackage rec {
pname = "spyse-python";
version = "2.2.3";
+ format = "setuptools";
disabled = pythonOlder "3.8";
@@ -34,7 +35,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "'dataclasses~=0.6'," "" \
- --replace "responses~=0.13.3" "responses>=0.13.3"
+ --replace "responses~=0.13.3" "responses>=0.13.3" \
+ --replace "limiter~=0.1.2" "limiter>=0.1.2"
'';
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index 944a2cf08e09..da64d44a43fe 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy-Continuum";
- version = "1.3.11";
+ version = "1.3.12";
src = fetchPypi {
inherit pname version;
- sha256 = "1c9yd9s98crqgs39rc2ld2r0nchgyjrfbjdlqb99y4hhc6lv04xw";
+ sha256 = "rlHl59MAQhsicMtZQT9rv1iQrDyVYJlawtyhvFaAM7o=";
};
propagatedBuildInputs = [
@@ -41,7 +41,5 @@ buildPythonPackage rec {
homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
description = "Versioning and auditing extension for SQLAlchemy";
license = licenses.bsd3;
- # https://github.com/kvesteri/sqlalchemy-continuum/issues/255
- broken = lib.versionAtLeast sqlalchemy.version "1.4";
};
}
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index bb757ab45b0a..bfae1d7b3b9d 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python
-, unittest2, scripttest, pytz, mock
-, testtools, pbr, tempita, decorator, sqlalchemy
+, scripttest, pytz, pbr, tempita, decorator, sqlalchemy
, six, sqlparse, testrepository
}:
+
buildPythonPackage rec {
pname = "sqlalchemy-migrate";
version = "0.13.0";
@@ -13,21 +13,27 @@ buildPythonPackage rec {
};
# See: https://review.openstack.org/#/c/608382/
- patches = [ (fetchpatch {
- url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch";
- sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
- }) ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch";
+ sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace test-requirements.txt \
+ --replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \
+ --replace "ibm-db-sa-py3;python_version>='3.0'" "" \
+ --replace "tempest-lib>=0.1.0" "" \
+ --replace "testtools>=0.9.34,<0.9.36" "" \
+ --replace "pylint" ""
+ '';
- checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
+ checkInputs = [ scripttest pytz testrepository ];
propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
doCheck = !stdenv.isDarwin;
- prePatch = ''
- sed -i -e /tempest-lib/d \
- -e /testtools/d \
- test-requirements.txt
- '';
checkPhase = ''
export PATH=$PATH:$out/bin
echo sqlite:///__tmp__ > test_db.cfg
@@ -41,9 +47,9 @@ buildPythonPackage rec {
'';
meta = with lib; {
- homepage = "https://github.com/openstack/sqlalchemy-migrate";
+ homepage = "https://opendev.org/x/sqlalchemy-migrate";
description = "Schema migration tools for SQLAlchemy";
license = licenses.asl20;
- maintainers = with maintainers; [ makefu ];
+ maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]);
};
}
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index dc983e20ce23..685bb829dd3b 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "sqlalchemy-utils";
- version = "0.37.7";
+ version = "0.37.9";
src = fetchPypi {
inherit version;
pname = "SQLAlchemy-Utils";
- sha256 = "sha256-cW2dlZIljbllGlEdA+ayVTJCwqRAhV7j99WBK7tV2es=";
+ sha256 = "4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a8c85fdffd64..085195f5a752 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.4.27";
+ version = "1.4.29";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-12g1na6zqGZE84VMZlnkSWo+a7orRlHsyHznrUFbMgw=";
+ sha256 = "sha256:+iutFOFHS6ZJz8lpwdLskV3T55Z380a7/gjpPvkCCzk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index d0c4d39f1165..44cd64821d9d 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -12,11 +12,12 @@
, testVersion
, tomlkit
, staticjinja
+, callPackage
}:
buildPythonPackage rec {
pname = "staticjinja";
- version = "4.1.1";
+ version = "4.1.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
- sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM=";
+ sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM=";
};
nativeBuildInputs = [
@@ -51,8 +52,9 @@ buildPythonPackage rec {
export PATH="$PATH:$out/bin";
'';
- passthru.tests.version = testVersion {
- package = staticjinja;
+ passthru.tests = {
+ version = testVersion { package = staticjinja; };
+ minimal-template = callPackage ./test-minimal-template {};
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix b/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix
new file mode 100644
index 000000000000..e51a619c9e90
--- /dev/null
+++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, staticjinja }:
+
+stdenv.mkDerivation {
+ name = "staticjinja-test-minimal-template";
+ meta.timeout = 30;
+ buildCommand = ''
+ ${staticjinja}/bin/staticjinja build --srcpath ${./templates}
+ grep 'Hello World!' index
+ touch $out
+ '';
+}
diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include
new file mode 100644
index 000000000000..216e97ce0822
--- /dev/null
+++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/include
@@ -0,0 +1 @@
+World
diff --git a/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index
new file mode 100644
index 000000000000..03e1043180d8
--- /dev/null
+++ b/pkgs/development/python-modules/staticjinja/test-minimal-template/templates/index
@@ -0,0 +1 @@
+Hello {% include './include' %}!
diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index 1d74a62babd4..66ed134772d7 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.6.0";
+ version = "1.6.1";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "73fa9769214a310486d7916453a09bd38b07d28a9dcbdf27719183c1d7d949f6";
+ sha256 = "688be16ee5d1a2f94aa4abdc6d881e8e254d173d724ac88725955fe66bdb63d4";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 4acad30ea322..c808fe6acd2d 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.64.0";
+ version = "2.65.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2f4b2175046104e4fcd8a2689a68bb9828a857814126d2ed13772cf2554fb93e";
+ sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 00e8306a25d4..68e35a1d0eca 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -7,11 +7,7 @@
, pandas
, dask
, distributed
-, coverage
-, flake8
-, black
-, pytest
-, codecov
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -35,18 +31,9 @@ buildPythonPackage rec {
pandas
dask
distributed
- coverage
- flake8
- black
- pytest
- codecov
+ pytestCheckHook
];
- # ignore changed numpy operations
- checkPhase = ''
- pytest -k 'not allc'
- '';
-
meta = with lib; {
description = "A powerful and scalable library that can be used for a variety of time series data mining tasks";
homepage = "https://github.com/TDAmeritrade/stumpy";
diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index c59626fc85c3..704a4cb924ac 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -4,6 +4,7 @@
, cppunit
, pkg-config
, subunit
+, pythonOlder
# python dependencies
, fixtures
@@ -11,6 +12,7 @@
, pytest
, testscenarios
, testtools
+, unittest2
}:
buildPythonPackage {
@@ -20,7 +22,10 @@ buildPythonPackage {
buildInputs = [ check cppunit ];
propagatedBuildInputs = [ testtools ];
- checkInputs = [ testscenarios hypothesis fixtures pytest ];
+ checkInputs = [ testscenarios hypothesis fixtures pytest unittest2 ];
+
+ # requires unittest2, which no longer supported in 3.10
+ doCheck = pythonOlder "3.10";
# ignore tests which call shell code, or call methods which haven't been implemented
checkPhase = ''
pytest python/subunit \
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index 9759443228d0..13c8107c9aef 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \
- --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"'
+ --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \
+ --replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix
index 1bc1e58f1ae7..9a0cf1a30f8d 100644
--- a/pkgs/development/python-modules/svglib/default.nix
+++ b/pkgs/development/python-modules/svglib/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "svglib";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "520ee5290ee2ebeebd20ca0d7d995c08c903b364fcf515826bab43a1288d422e";
+ sha256 = "33f075dc853807e56e92d6dc404104c6ccc7fb5388d96ab943d7b349b1c924c7";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index d46fc14cdf67..7114f0aeba48 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -1,28 +1,40 @@
{ lib
, buildPythonApplication
, fetchPypi
-, pytest
-, nose
+, pytestCheckHook
+, pythonOlder
}:
buildPythonApplication rec {
pname = "sybil";
version = "2.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524";
};
- checkInputs = [ pytest nose ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27
+ "test_future_imports"
+ "test_pytest"
+ ];
- checkPhase = ''
- py.test tests
- '';
+ pythonImportsCheck = [
+ "sybil"
+ ];
meta = with lib; {
description = "Automated testing for the examples in your documentation";
homepage = "https://github.com/cjw296/sybil";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
new file mode 100644
index 000000000000..040db8d1e078
--- /dev/null
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "syslog-rfc5424-formatter";
+ version = "1.2.2";
+
+ src = fetchFromGitHub {
+ owner = "easypost";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "17ym5ls5r6dd9pg9frdz8myfq5fxyqlwdq1gygc9vnrxbgw2c9kb";
+ };
+
+ # Tests are not picked up, review later again
+ doCheck = false;
+
+ pythonImportsCheck = [ "syslog_rfc5424_formatter" ];
+
+ meta = with lib; {
+ description = "Python logging formatter for emitting RFC5424 Syslog messages";
+ homepage = "https://github.com/easypost/syslog-rfc5424-formatter";
+ license = with licenses; [ isc ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 83f6d9ac0637..18ab606afdd7 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -5,17 +5,17 @@
buildPythonPackage rec {
pname = "tatsu";
- version = "5.6.1";
+ version = "5.7.3";
+ # upstream only supports 3.10+
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "neogeny";
repo = "TatSu";
rev = "v${version}";
- sha256 = "149ra1lwax5m1svlv4dwjfqw00lc5vwyfj6zw2v0ammmfm1b94x9";
+ sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292";
};
- disabled = pythonOlder "3.8";
-
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ colorama regex ];
checkInputs = [ pytestCheckHook pytest-mypy ];
diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 5fa1ad4c539b..39f7a82cd9ec 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonApplication
, fetchPypi
+, fetchpatch
, pbr
, cliff
, jsonschema
@@ -20,7 +21,6 @@
, prettytable
, urllib3
, debtcollector
-, unittest2
, hacking
, oslotest
, bash
@@ -36,6 +36,14 @@ buildPythonApplication rec {
sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";
};
+ patches = [
+ # remove need for unittest2
+ (fetchpatch {
+ url = "https://github.com/openstack/tempest/commit/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch";
+ sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk=";
+ })
+ ];
+
propagatedBuildInputs = [
pbr
cliff
@@ -56,7 +64,6 @@ buildPythonApplication rec {
prettytable
urllib3
debtcollector
- unittest2
];
checkInputs = [
diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix
index 2127d2275678..eacb5b4cdc80 100644
--- a/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/pkgs/development/python-modules/tensorboardx/default.nix
@@ -1,13 +1,14 @@
{ boto3
, buildPythonPackage
, crc32c
+, which
, fetchFromGitHub
, lib
, matplotlib
, moto
, numpy
, pillow
-, protobuf
+, protobuf3_8
, pytestCheckHook
, pytorch
, six
@@ -24,7 +25,7 @@ buildPythonPackage rec {
owner = "lanpa";
repo = "tensorboardX";
rev = "v${version}";
- sha256 = "1kcw062bcqvqva5kag9j7q72wk3vdqgf5cnn0lxmsvhlmq5sjdfn";
+ sha256 = "sha256-1jWpC64Ubl07Bday4h5ue0wuDj4yPTWL2nhjtoQBnM0=";
};
# apparently torch API changed a bit at 1.6
@@ -34,10 +35,16 @@ buildPythonPackage rec {
"torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
'';
+ # Wanted protobuf version is mentioned here:
+ # https://github.com/lanpa/tensorboardX/blob/0d08112618a2bbda4c028a15a137fed3afe77401/compile.sh#L6
+ nativeBuildInputs = [ which protobuf3_8 ];
+
+ # required to make tests deterministic
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
propagatedBuildInputs = [
crc32c
numpy
- protobuf
six
soundfile
];
@@ -63,9 +70,6 @@ buildPythonPackage rec {
disabledTestPaths = [
# we are not interested in linting errors
"tests/test_lint.py"
- # breaks with `RuntimeError: cannot schedule new futures after interpreter shutdown`
- # Upstream tracking bug: https://github.com/lanpa/tensorboardX/issues/652
- "tests/test_pr_curve.py"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch b/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch
new file mode 100644
index 000000000000..71e5da5e11bb
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch
@@ -0,0 +1,22 @@
+diff --git a/tensorflow_datasets/image_classification/corruptions.py b/tensorflow_datasets/image_classification/corruptions.py
+index 066c4460..cb9a6667 100644
+--- a/tensorflow_datasets/image_classification/corruptions.py
++++ b/tensorflow_datasets/image_classification/corruptions.py
+@@ -35,7 +35,7 @@ FROST_FILENAMES = []
+
+
+ def _imagemagick_bin():
+- return 'imagemagick' # pylint: disable=unreachable
++ return 'convert' # pylint: disable=unreachable
+
+
+ # /////////////// Corruption Helpers ///////////////
+@@ -675,7 +675,7 @@ def spatter(x, severity=1):
+ # ker = np.array([[-1,-2,-3],[-2,0,0],[-3,0,1]], dtype=np.float32)
+ # ker -= np.mean(ker)
+ ker = np.array([[-2, -1, 0], [-1, 1, 1], [0, 1, 2]])
+- dist = cv2.filter2D(dist, cv2.CVX_8U, ker)
++ dist = cv2.filter2D(dist, cv2.CV_8U, ker)
+ dist = cv2.blur(dist, (3, 3)).astype(np.float32)
+
+ m = cv2.cvtColor(liquid_layer * dist, cv2.COLOR_GRAY2BGRA)
diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
new file mode 100644
index 000000000000..98e38bba56ad
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -0,0 +1,141 @@
+{ apache-beam
+, attrs
+, beautifulsoup4
+, buildPythonPackage
+, dill
+, dm-tree
+, fetchFromGitHub
+, ffmpeg
+, future
+, imagemagick
+, importlib-resources
+, jinja2
+, langdetect
+, lib
+, matplotlib
+, mwparserfromhell
+, networkx
+, nltk
+, numpy
+, opencv4
+, pandas
+, pillow
+, promise
+, protobuf
+, pycocotools
+, pydub
+, pytestCheckHook
+, requests
+, scikitimage
+, scipy
+, six
+, tensorflow
+, tensorflow-metadata
+, termcolor
+, tifffile
+, tqdm
+}:
+
+buildPythonPackage rec {
+ pname = "tensorflow-datasets";
+ version = "4.4.0";
+
+ src = fetchFromGitHub {
+ owner = "tensorflow";
+ repo = "datasets";
+ rev = "v${version}";
+ sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6";
+ };
+
+ patches = [
+ # addresses https://github.com/tensorflow/datasets/issues/3673
+ ./corruptions.patch
+ ];
+
+ propagatedBuildInputs = [
+ attrs
+ dill
+ dm-tree
+ future
+ importlib-resources
+ numpy
+ promise
+ protobuf
+ requests
+ six
+ tensorflow-metadata
+ termcolor
+ tqdm
+ ];
+
+ pythonImportsCheck = [
+ "tensorflow_datasets"
+ ];
+
+ checkInputs = [
+ apache-beam
+ beautifulsoup4
+ ffmpeg
+ imagemagick
+ jinja2
+ langdetect
+ matplotlib
+ mwparserfromhell
+ networkx
+ nltk
+ opencv4
+ pandas
+ pillow
+ pycocotools
+ pydub
+ pytestCheckHook
+ scikitimage
+ scipy
+ tensorflow
+ tifffile
+ ];
+
+ disabledTestPaths = [
+ # Sandbox violations: network access, filesystem write attempts outside of build dir, ...
+ "tensorflow_datasets/core/dataset_builder_test.py"
+ "tensorflow_datasets/core/dataset_info_test.py"
+ "tensorflow_datasets/core/features/features_test.py"
+ "tensorflow_datasets/core/github_api/github_path_test.py"
+ "tensorflow_datasets/core/utils/gcs_utils_test.py"
+ "tensorflow_datasets/scripts/cli/build_test.py"
+
+ # Requires `pretty_midi` which is not packaged in `nixpkgs`.
+ "tensorflow_datasets/audio/groove_test.py"
+
+ # Requires `crepe` which is not packaged in `nixpkgs`.
+ "tensorflow_datasets/audio/nsynth_test.py"
+
+ # Requires `gcld3` and `pretty_midi` which are not packaged in `nixpkgs`.
+ "tensorflow_datasets/core/lazy_imports_lib_test.py"
+
+ # Requires `tensorflow_io` which is not packaged in `nixpkgs`.
+ "tensorflow_datasets/image/lsun_test.py"
+
+ # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments`
+ # deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related
+ # to the differences in some of the dependencies?
+ "tensorflow_datasets/rl_unplugged/rlu_atari/rlu_atari_test.py"
+
+ # Requires `tensorflow_docs` which is not packaged in `nixpkgs` and the test is for documentation anyway.
+ "tensorflow_datasets/scripts/documentation/build_api_docs_test.py"
+
+ # Not a test, should not be executed.
+ "tensorflow_datasets/testing/test_utils.py"
+
+ # Require `gcld3` and `nltk.punkt` which are not packaged in `nixpkgs`.
+ "tensorflow_datasets/text/c4_test.py"
+ "tensorflow_datasets/text/c4_utils_test.py"
+ ];
+
+ meta = with lib; {
+ description = "Library of datasets ready to use with TensorFlow";
+ homepage = "https://www.tensorflow.org/datasets/overview";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 221c75112b9b..2556a8039c1b 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -48,6 +48,8 @@ in buildPythonPackage {
inherit (packages) version;
format = "wheel";
+ disabled = pythonAtLeast "3.10";
+
src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
platform = if stdenv.isDarwin then "mac" else "linux";
diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix
index 51a0b0712240..cb528b5b4e9a 100644
--- a/pkgs/development/python-modules/terminaltables/default.nix
+++ b/pkgs/development/python-modules/terminaltables/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "terminaltables";
- version = "3.1.0";
+ version = "3.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81";
+ sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix
index e49ff6401454..2e7aa7086291 100644
--- a/pkgs/development/python-modules/tern/default.nix
+++ b/pkgs/development/python-modules/tern/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "tern";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9cb509dba91718feecefd302388a89d4782454f6613e8f931ec8de87a6594de0";
+ sha256 = "c7ce55a500061e1160b040e75dc38d0eccc790a2b70fa3b7ad1b4fb715c18fc9";
};
preBuild = ''
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 19e42e917dd3..132e0810d3dc 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
- version = "1.4.2";
+ version = "1.6.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw=";
+ sha256 = "1jxdfk2ka131spnfkl35lnzvkgwgsbs5xl3hsjj03q1nfjcqvx9l";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 99be9957a5ef..b582bf4bc7f7 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,9 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy27
, mock
, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
, sybil
, twisted
, zope_component
@@ -12,6 +13,9 @@
buildPythonPackage rec {
pname = "testfixtures";
version = "6.18.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -19,29 +23,42 @@ buildPythonPackage rec {
};
checkInputs = [
- pytestCheckHook
mock
+ pytestCheckHook
sybil
- zope_component
twisted
+ zope_component
];
- doCheck = !isPy27;
-
disabledTestPaths = [
# Django is too much hasle to setup at the moment
"testfixtures/tests/test_django"
];
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/simplistix/testfixtures/issues/168
+ "test_invalid_communicate_call"
+ "test_invalid_kill"
+ "test_invalid_parameters"
+ "test_invalid_poll"
+ "test_invalid_send_signal"
+ "test_invalid_terminate"
+ "test_invalid_wait_call"
+ "test_replace_delattr_cant_remove"
+ "test_replace_delattr_cant_remove_not_strict"
+ ];
+
pytestFlagsArray = [
"testfixtures/tests"
];
- pythonImportsCheck = [ "testfixtures" ];
+ pythonImportsCheck = [
+ "testfixtures"
+ ];
meta = with lib; {
+ description = "Collection of helpers and mock objects for unit tests and doc tests";
homepage = "https://github.com/Simplistix/testfixtures";
- description = "A collection of helpers and mock objects for unit tests and doc tests";
license = licenses.mit;
maintainers = with maintainers; [ siriobalmelli ];
};
diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix
index be332ac791a2..e11ddeed50a6 100644
--- a/pkgs/development/python-modules/testpath/default.nix
+++ b/pkgs/development/python-modules/testpath/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
@@ -17,6 +18,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ preCheck = lib.optionalString stdenv.isDarwin ''
+ # Work around https://github.com/jupyter/testpath/issues/24
+ export TMPDIR="/tmp"
+ '';
+
meta = with lib; {
description = "Test utilities for code working with files and commands";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix
index e2dfdcbe3ece..84900ad5477e 100644
--- a/pkgs/development/python-modules/testtools/default.nix
+++ b/pkgs/development/python-modules/testtools/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f";
};
- propagatedBuildInputs = [ pbr python-mimeparse extras unittest2 ];
+ propagatedBuildInputs = [ pbr python-mimeparse extras ];
buildInputs = [ traceback2 ];
# testscenarios has a circular dependency on testtools
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 5c8928a385d4..ee2e2bb2c993 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -21,12 +21,12 @@
buildPythonPackage rec {
pname = "textacy";
- version = "0.11.0";
+ version = "0.12.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-d/tyTCewoERA15iBv4H2LORFzgco15fnnN1sneeGuF4=";
+ sha256 = "2c92bdd6b47305447b64e4cb6cc43c11675f021f910a8074bc8149dbf5325e5b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix
index 7fd62d7bcbe3..728676b53b38 100644
--- a/pkgs/development/python-modules/tgcrypto/default.nix
+++ b/pkgs/development/python-modules/tgcrypto/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "tgcrypto";
- version = "1.2.2";
+ version = "1.2.3";
disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "pyrogram";
repo = "tgcrypto";
rev = "v${version}";
- sha256 = "1vyjycjb2n790371kf47qc0mkvd4bxmhh65cfxjsrcjpiri7shjf";
+ sha256 = "06g1kv3skq2948h0sjf64s1cr2p1rhxnx5pf9nmvhxkmri1xmfzs";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index 7f353a19207d..7a4f0e5ee855 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
- version = "3.10.5";
+ version = "3.10.6";
pname = "thespian";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "17adad8afbc4779a01f34a6595c63fceccfd21f10556b85a261338eb99b5d306";
+ sha256 = "c987a8042ba2303e22371f38a67354593dd81c4c11ba1eba7f6657409288d5ed";
};
# Do not run the test suite: it takes a long time and uses
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 2e4676267215..fdd4c2bf0b2f 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -1,53 +1,55 @@
{ lib
-, fetchPypi
, buildPythonPackage
-, isPy27
-, isPy3k
+, dask
+, fetchPypi
+, fsspec
+, lxml
, numpy
-, imagecodecs-lite
-, enum34 ? null
-, futures ? null
-, pathlib ? null
-, pytest
+, pytestCheckHook
+, pythonOlder
+, zarr
}:
buildPythonPackage rec {
pname = "tifffile";
version = "2021.11.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b";
+ hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs=";
};
- patches = lib.optional isPy27 ./python2-regex-compat.patch;
-
- # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles
- # and test data missing from PyPI tarball
- doCheck = false;
+ propagatedBuildInputs = [
+ numpy
+ ];
checkInputs = [
- pytest
+ dask
+ fsspec
+ lxml
+ pytestCheckHook
+ zarr
];
- checkPhase = ''
- pytest
- '';
+ disabledTests = [
+ # Test require network access
+ "test_class_omexml"
+ "test_write_ome"
+ # Test file is missing
+ "test_write_predictor"
+ ];
- propagatedBuildInputs = [
- numpy
- ] ++ lib.optionals isPy3k [
- imagecodecs-lite
- ] ++ lib.optionals isPy27 [
- futures
- enum34
- pathlib
+ pythonImportsCheck = [
+ "tifffile"
];
meta = with lib; {
- description = "Read and write image data from and to TIFF files.";
- homepage = "https://www.lfd.uci.edu/~gohlke/";
- maintainers = [ maintainers.lebastr ];
+ description = "Read and write image data from and to TIFF files";
+ homepage = "https://github.com/cgohlke/tifffile/";
license = licenses.bsd3;
+ maintainers = with maintainers; [ lebastr ];
};
}
diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index 240a8ac0c37e..8ac7f66565b7 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "time-machine";
- version = "2.5.0";
+ version = "2.6.0";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "adamchainz";
repo = pname;
rev = version;
- sha256 = "sha256-U/OgkwRgZMdEkMIQuN9bWXWeeMHiduy1C1xOBUl8NsQ=";
+ sha256 = "sha256-D3cbArF09b5+LkkdosNbYMfndnzCPWwNqzIww23pOtk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
new file mode 100644
index 000000000000..58bf190495f4
--- /dev/null
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+, pytestCheckHook
+, requests
+}:
+
+python3Packages.buildPythonPackage rec {
+ pname = "timetagger";
+ version = "22.1.2";
+
+ src = fetchFromGitHub {
+ owner = "almarklein";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw";
+ };
+
+ meta = with lib; {
+ homepage = "https://timetagger.app";
+ license = licenses.gpl3;
+ description = "Tag your time, get the insight";
+ maintainers = with maintainers; [ matthiasbeyer ];
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ requests
+ ];
+
+ preCheck = ''
+ # https://github.com/NixOS/nixpkgs/issues/12591
+ mkdir -p check-phase
+ export HOME=$(pwd)/check-phase
+ '';
+
+ propagatedBuildInputs = with python3Packages; [
+ asgineer
+ itemdb
+ jinja2
+ markdown
+ pscript
+ pyjwt
+ uvicorn
+ ];
+
+}
diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix
index 958624f80935..0e7bcb303f30 100644
--- a/pkgs/development/python-modules/tinydb/default.nix
+++ b/pkgs/development/python-modules/tinydb/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tinydb";
- version = "4.5.2";
+ version = "4.6.1";
disabled = pythonOlder "3.5";
format = "pyproject";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "msiemens";
repo = pname;
rev = "v${version}";
- sha256 = "0gyc9rk1adw4gynwnv4kfas0hxv1cql0sm5b3fsms39088ha894l";
+ sha256 = "17m8g6xzwa0k8qb4k4p9hjcyv58gmxz1lkvr2ckc5csa0ydvv91a";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
new file mode 100644
index 000000000000..331729e25c58
--- /dev/null
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchPypi
+, python
+, buildPythonPackage
+, pythonOlder
+, pytorch
+, pytestCheckHook
+, torchvision
+}:
+
+buildPythonPackage rec {
+ pname = "torchinfo";
+ version = "1.6.3";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-g1xhtdwygzPTTswP8iZ364ynBQE7D+aAsZ3d9EpyvIA=";
+ };
+
+ propagatedBuildInputs = [
+ pytorch
+ torchvision
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Skip as it downloads pretrained weights (require network access)
+ "test_eval_order_doesnt_matter"
+ ];
+
+ pythonImportsCheck = [ "torchvision" ];
+
+ meta = {
+ description = "API to visualize pytorch models";
+ homepage = "https://github.com/TylerYep/torchinfo";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ petterstorvik ];
+ };
+}
diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index 4e93f1369dd3..9e6b1a5056da 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -1,29 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy27
-, python
+, pythonOlder
, numpy
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "traits";
version = "6.3.2";
- disabled = isPy27;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6";
};
- propagatedBuildInputs = [ numpy ];
-
- # Test suite is broken for 3.x on latest release
- # https://github.com/enthought/traits/issues/187
- # https://github.com/enthought/traits/pull/188
- # Furthermore, some tests fail due to being in a chroot
+ # Circular dependency
doCheck = false;
+ pythonImportsCheck = [
+ "traits"
+ ];
+
meta = with lib; {
description = "Explicitly typed attributes for Python";
homepage = "https://pypi.python.org/pypi/traits";
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 5479a0b12258..917aef54b6bf 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.12.5";
+ version = "4.15.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy";
+ sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg";
};
nativeBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix
index 94d3cb85be40..ff37464a0f34 100644
--- a/pkgs/development/python-modules/transip/default.nix
+++ b/pkgs/development/python-modules/transip/default.nix
@@ -1,36 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
, requests
, cryptography
, suds-jurko
-, pytest
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
- pname = "transip-api";
+ pname = "transip";
version = "2.0.0";
- disabled = isPy27;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "benkonrath";
- repo = pname;
+ repo = "transip-api";
rev = "v${version}";
- sha256 = "153x8ph7cp432flaqiy2zgp060ddychcqcrssxkcmjvbm86xrz17";
+ hash = "sha256-J/zcDapry8pm1zozzCDzrQED7vvCR6yoE4NcduBFfZQ=";
};
- checkInputs = [ pytest ];
+ propagatedBuildInputs = [
+ requests
+ cryptography
+ suds-jurko
+ ];
- # Constructor Tests require network access
- checkPhase = ''
- pytest --deselect=tests/service_tests/test_domain.py::TestDomainService::test_constructor \
- --deselect tests/service_tests/test_vps.py::TestVPSService::testConstructor \
- --deselect tests/service_tests/test_webhosting.py::TestWebhostingService::testConstructor
- '';
+ checkInputs = [
+ pytestCheckHook
+ ];
+ disabledTests = [
+ # Constructor tests require network access
+ "test_constructor"
+ "testConstructor"
+ ];
- propagatedBuildInputs = [ requests cryptography suds-jurko ];
+ pythonImportsCheck = [
+ "transip"
+ ];
meta = with lib; {
description = "TransIP API Connector";
diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index 0dca476debf0..76a82e7c6213 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonAtLeast
, six
, pygraphviz
, pytestCheckHook
@@ -13,6 +14,7 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.8.10";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -36,6 +38,16 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
+ disabledTests = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/pytransitions/transitions/issues/563
+ "test_multiple_models"
+ "test_timeout"
+ ];
+
+ pythonImportsCheck = [
+ "transitions"
+ ];
+
meta = with lib; {
homepage = "https://github.com/pytransitions/transitions";
description = "A lightweight, object-oriented finite state machine implementation in Python";
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
new file mode 100644
index 000000000000..1f4a55416d56
--- /dev/null
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -0,0 +1,74 @@
+{ buildPythonPackage
+, cloudpickle
+, dm-haiku
+, einops
+, fetchFromGitHub
+, flax
+, hypothesis
+, keras
+, lib
+, poetry-core
+, pytestCheckHook
+, pyyaml
+, rich
+, tensorflow
+, treeo
+}:
+
+buildPythonPackage rec {
+ pname = "treex";
+ version = "0.6.8";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "cgarciae";
+ repo = pname;
+ rev = version;
+ sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \
+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \
+ --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"'
+ '';
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ einops
+ flax
+ pyyaml
+ rich
+ treeo
+ ];
+
+ checkInputs = [
+ cloudpickle
+ dm-haiku
+ hypothesis
+ keras
+ pytestCheckHook
+ tensorflow
+ ];
+
+ pythonImportsCheck = [
+ "treex"
+ ];
+
+ disabledTestPaths = [
+ # Require `torchmetrics` which is not packaged in `nixpkgs`.
+ "tests/metrics/test_mean_absolute_error.py"
+ "tests/metrics/test_mean_square_error.py"
+ ];
+
+ meta = with lib; {
+ description = "Pytree Module system for Deep Learning in JAX";
+ homepage = "https://github.com/cgarciae/treex";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index a9b4092752e2..9032b7637cbe 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.9.41";
+ version = "3.9.42";
src = fetchPypi {
inherit pname version;
- sha256 = "7cacd454f4cfde741698aa8bca4fdbc775dc42f66a3135dd0c8308fe7ba733be";
+ sha256 = "d9a6e977989f1f8344b1f86dbce0511dc431733deb0ad21ff8375f6f47282b39";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 0e95da38eaea..e667f146afc0 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -37,6 +37,10 @@ buildPythonPackage rec {
"fallback_when_no_hook_claims_it"
];
+ pytestFlagsArray = [
+ "-W" "ignore::DeprecationWarning"
+ ];
+
propagatedBuildInputs = [
attrs
sortedcontainers
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 8ee48d938e38..59585ddc3fe0 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -24,14 +24,14 @@
buildPythonApplication rec {
pname = "trytond";
- version = "6.2.1";
+ version = "6.2.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "418f16c45b7130555447af901639b92bb188d39f46ce7fe4dfcd941c5959ed7e";
+ sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193";
};
# Tells the tests which database to use
diff --git a/pkgs/development/python-modules/twinkly-client/default.nix b/pkgs/development/python-modules/twinkly-client/default.nix
index fc856430da95..77eb17b9fcda 100644
--- a/pkgs/development/python-modules/twinkly-client/default.nix
+++ b/pkgs/development/python-modules/twinkly-client/default.nix
@@ -7,19 +7,26 @@
buildPythonPackage rec {
pname = "twinkly-client";
- version = "0.0.2";
+ version = "0.0.3";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i";
+ sha256 = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8=";
};
- propagatedBuildInputs = [ aiohttp ];
+ propagatedBuildInputs = [
+ aiohttp
+ ];
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "twinkly_client" ];
+
+ pythonImportsCheck = [
+ "twinkly_client"
+ ];
meta = with lib; {
description = "Python module to communicate with Twinkly LED strings";
diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix
index 4436c5a2a6a4..e668f324fabb 100644
--- a/pkgs/development/python-modules/types-decorator/default.nix
+++ b/pkgs/development/python-modules/types-decorator/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-decorator";
- version = "5.1.2";
+ version = "5.1.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "b3dd9027af1131b4e55ccd09248b7accc7a02d567139e2009ed20db13cf90600";
+ sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610";
};
# Modules doesn't have tests
diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix
new file mode 100644
index 000000000000..687ddd1b17cc
--- /dev/null
+++ b/pkgs/development/python-modules/types-freezegun/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "types-freezegun";
+ version = "1.1.6";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8=";
+ };
+
+ # Module doesn't have tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "freezegun-stubs"
+ ];
+
+ meta = with lib; {
+ description = "Typing stubs for freezegun";
+ homepage = "https://github.com/python/typeshed";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jpetrucciani ];
+ };
+}
diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix
index 845dab08d330..e56cbb62b33e 100644
--- a/pkgs/development/python-modules/types-futures/default.nix
+++ b/pkgs/development/python-modules/types-futures/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "types-futures";
- version = "3.3.1";
+ version = "3.3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "bbdad92cec642693bac10fbbecf834776009db7782d91dc293bdd123be73186d";
+ sha256 = "d286db818fb67e3ce5c28acd9058c067329b91865acc443ac3cf91497fa36f05";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index 398f71a4c4c5..d4708e58706f 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-protobuf";
- version = "3.18.3";
+ version = "3.19.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "d3e253ebc1ba5e78932fef703dc4316afb7e5facd0ce8661b3921c9d541e16a7";
+ sha256 = "9e3d954de5f5693817514b8da3476daa22f035d2b8060217c78c3831a1a49c23";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index b9d0abc25b11..faf5ee8bdcb6 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-pytz";
- version = "2021.3.3";
+ version = "2021.3.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-9tIdZoeTWhYV20ZLHh34ANGVAsNrwEhvQ759/SxASUc=";
+ sha256 = "101da53091013bb07403468c20d36930d749d3918054ac46f9c1bfc607dadf7d";
};
# Modules doesn't have tests
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 6dec072bb509..21498135916d 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -1,18 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
+, types-urllib3
}:
buildPythonPackage rec {
pname = "types-requests";
- version = "2.27.0";
+ version = "2.27.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-vFztDc8GdOPx+d7XNM7p+kXFfPZEsInmLI+xLKKOshU=";
+ sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c=";
};
+ propagatedBuildInputs = [
+ types-urllib3
+ ];
+
# Module doesn't have tests
doCheck = false;
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index b88dc5b0260b..3812a1c64f2c 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
- version = "57.4.5";
+ version = "57.4.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-pGAO/cpoozIErZwIP9mWbWOu5hp9AH6RK2r8b/V9bgI=";
+ sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix
new file mode 100644
index 000000000000..9e5c9b628b2d
--- /dev/null
+++ b/pkgs/development/python-modules/types-tabulate/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "types-tabulate";
+ version = "0.8.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";
+ };
+
+ # Module doesn't have tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "tabulate-stubs"
+ ];
+
+ meta = with lib; {
+ description = "Typing stubs for tabulate";
+ homepage = "https://github.com/python/typeshed";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jpetrucciani ];
+ };
+}
diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix
index d87528c20324..c8f520524184 100644
--- a/pkgs/development/python-modules/types-toml/default.nix
+++ b/pkgs/development/python-modules/types-toml/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-toml";
- version = "0.10.1";
+ version = "0.10.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "1jqh0vki1hccj391gnxpblim429sj56npgq2z749f8v9ay6qy7sw";
+ sha256 = "215a7a79198651ec5bdfd66193c1e71eb681a42f3ef7226c9af3123ced62564a";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
new file mode 100644
index 000000000000..5224b57d6cff
--- /dev/null
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "types-urllib3";
+ version = "1.26.7";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-z9H7vkuppgXtFIKUAIqsinuLdHJlHRzDV9UHrlli49I=";
+ };
+
+ # Module doesn't have tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "urllib3-stubs"
+ ];
+
+ meta = with lib; {
+ description = "Typing stubs for urllib3";
+ homepage = "https://github.com/python/typeshed";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix
index f7dcf33ea7fd..30d26293e5d1 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/pkgs/development/python-modules/typesystem/default.nix
@@ -1,23 +1,24 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
-, pytestCheckHook
-, pytest-cov
, jinja2
+, pytestCheckHook
+, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
pname = "typesystem";
- version = "0.2.4";
- disabled = isPy27;
+ version = "0.4.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "1k0jwcky17zwaz2vx4x2zbsnp270g4mgn7kx5bpl8jgx76qmsnba";
+ hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
};
propagatedBuildInputs = [
@@ -27,23 +28,16 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest-cov
];
- disabledTests = [
- # https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed
- # the default string formatting of regular expression flags which breaks test assertion
- "test_to_json_schema_complex_regular_expression"
- ];
- disabledTestPaths = [
- # for some reason jinja2 not picking up forms directory (1% of tests)
- "tests/test_forms.py"
+ pythonImportsCheck = [
+ "typesystem"
];
meta = with lib; {
description = "A type system library for Python";
homepage = "https://github.com/encode/typesystem";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix
index ee815fa15e1f..96a07802b1c8 100644
--- a/pkgs/development/python-modules/typical/default.nix
+++ b/pkgs/development/python-modules/typical/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fastjsonschema
, fetchFromGitHub
+, fetchpatch
, future-typing
, inflection
, mypy
@@ -18,7 +19,7 @@
buildPythonPackage rec {
pname = "typical";
- version = "2.7.9";
+ version = "2.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -27,13 +28,9 @@ buildPythonPackage rec {
owner = "seandstewart";
repo = "typical";
rev = "v${version}";
- sha256 = "sha256-ITIsSM92zftnvqLiVGFl//IbBb8N3ffkkqohzOx2JO4=";
+ hash = "sha256-DRjQmoZzWw5vpwIx70wQg6EO/aHqyX7RWpWZ9uOxSTg=";
};
- patches = [
- ./use-poetry-core.patch
- ];
-
nativeBuildInputs = [
poetry-core
];
@@ -56,6 +53,15 @@ buildPythonPackage rec {
pandas
];
+ patches = [
+ # Switch to poetry-core, https://github.com/seandstewart/typical/pull/193
+ (fetchpatch {
+ name = "switch-to-poetry-core.patch";
+ url = "https://github.com/seandstewart/typical/commit/66b3c34f8969b7fb1f684f0603e514405bab0dd7.patch";
+ sha256 = "sha256-c7qJOtHmJRnVEGl+OADB3HpjvMK8aYDD9+0gplOn9pQ=";
+ })
+ ];
+
disabledTests = [
# We use orjson
"test_ujson"
@@ -65,6 +71,8 @@ buildPythonPackage rec {
disabledTestPaths = [
"benchmark/"
+ # Tests are failing on Hydra
+ "tests/mypy/test_mypy.py"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/typical/use-poetry-core.patch b/pkgs/development/python-modules/typical/use-poetry-core.patch
deleted file mode 100644
index f3c32e621aea..000000000000
--- a/pkgs/development/python-modules/typical/use-poetry-core.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index a588a0d..43da394 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -154,7 +154,7 @@ exclude = '''
-
- [build-system]
- requires = ["poetry>=0.12"]
--build-backend = "poetry.masonry.api"
-+build-backend = "poetry.core.masonry.api"
-
- [bumpver]
- current_version = "v2.7.5"
diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix
deleted file mode 100644
index b3dcea203231..000000000000
--- a/pkgs/development/python-modules/typing/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python
-, pythonAtLeast }:
-
-let
- testDir = if isPy3k then "src" else "python2";
-
-in buildPythonPackage rec {
- pname = "typing";
- version = "3.10.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
- };
-
- disabled = pythonAtLeast "3.5";
-
- # Error for Python3.6: ImportError: cannot import name 'ann_module'
- # See https://github.com/python/typing/pull/280
- # Also, don't bother on PyPy: AssertionError: TypeError not raised
- doCheck = pythonOlder "3.6" && !isPyPy;
-
- checkPhase = ''
- cd ${testDir}
- ${python.interpreter} -m unittest discover
- '';
-
- meta = with lib; {
- description = "Backport of typing module to Python versions older than 3.5";
- homepage = "https://docs.python.org/3/library/typing.html";
- license = licenses.psfl;
- };
-}
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 15f098d90e48..f3c8792e569c 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "uamqp";
- version = "1.4.3";
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c=";
+ sha256 = "sha256-VevtbXtOTKQEqVYpNKFrDhvyDBJY+uQMhld6in+EroE=";
};
nativeBuildInputs = [
@@ -41,15 +41,6 @@ buildPythonPackage rec {
enum34
];
- patches = [
- (fetchpatch {
- url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch";
- sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd";
- stripLen = "2";
- extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/";
- })
- ];
-
dontUseCmakeConfigure = true;
# Project has no tests
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 81d70b0afc0d..91e8512d18d1 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -52,6 +52,9 @@ buildPythonPackage rec {
# Flaky test. Fails with AssertionError sometimes.
"test_sparse_hellinger"
+
+ # tensorflow maybe incompatible? https://github.com/lmcinnes/umap/issues/821
+ "test_save_load"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix
index cc5d2ae000ca..8d2c62de4e83 100644
--- a/pkgs/development/python-modules/urlextract/default.nix
+++ b/pkgs/development/python-modules/urlextract/default.nix
@@ -1,27 +1,31 @@
{ lib
-, appdirs
, buildPythonPackage
, dnspython
, fetchPypi
, filelock
, idna
+, platformdirs
, pytestCheckHook
+, pythonOlder
, uritools
}:
buildPythonPackage rec {
pname = "urlextract";
- version = "1.4.0";
+ version = "1.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "669f07192584b841b49ba8868fbd6b00e7ddc28367d36a3d8ca8c8e429420748";
+ hash = "sha256-QKXIQ9HXJTdY9W8NZ0jF6iekoUVl46kvJakW3cTB5B8=";
};
propagatedBuildInputs = [
- appdirs
filelock
idna
+ platformdirs
uritools
];
@@ -39,7 +43,9 @@ buildPythonPackage rec {
"test_dns_cache_reuse"
];
- pythonImportsCheck = [ "urlextract" ];
+ pythonImportsCheck = [
+ "urlextract"
+ ];
meta = with lib; {
description = "Collects and extracts URLs from given text";
diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix
deleted file mode 100644
index a52e68eac5e3..000000000000
--- a/pkgs/development/python-modules/urllib3/2.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib
-, brotli
-, buildPythonPackage
-, certifi
-, cryptography
-, python-dateutil
-, fetchpatch
-, fetchPypi
-, idna
-, mock
-, pyopenssl
-, pysocks
-, pytest-freezegun
-, pytest-timeout
-, pytestCheckHook
-, tornado
-, trustme
-}:
-
-buildPythonPackage rec {
- pname = "urllib3";
- version = "1.26.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
- };
-
- patches = [
- (fetchpatch {
- name = "CVE-2021-28363.patch";
- url = "https://github.com/urllib3/urllib3/commit/8d65ea1ecf6e2cdc27d42124e587c1b83a3118b0.patch";
- sha256 = "1lqhrd11p03iv14bp89rh67ynf000swmwsfvr3jpfdycdqr3ka9q";
- })
- ];
-
- propagatedBuildInputs = [
- brotli
- certifi
- cryptography
- idna
- pyopenssl
- pysocks
- ];
-
- checkInputs = [
- python-dateutil
- mock
- pytest-freezegun
- pytest-timeout
- pytestCheckHook
- tornado
- trustme
- ];
-
- # Tests in urllib3 are mostly timeout-based instead of event-based and
- # are therefore inherently flaky. On your own machine, the tests will
- # typically build fine, but on a loaded cluster such as Hydra random
- # timeouts will occur.
- #
- # The urllib3 test suite has two different timeouts in their test suite
- # (see `test/__init__.py`):
- # - SHORT_TIMEOUT
- # - LONG_TIMEOUT
- # When CI is in the env, LONG_TIMEOUT will be significantly increased.
- # Still, failures can occur and for that reason tests are disabled.
- doCheck = false;
-
- preCheck = ''
- export CI # Increases LONG_TIMEOUT
- '';
-
- pythonImportsCheck = [ "urllib3" ];
-
- meta = with lib; {
- description = "Powerful, sanity-friendly HTTP client for Python";
- homepage = "https://github.com/shazow/urllib3";
- license = licenses.mit;
- maintainers = with maintainers; [ fab ];
- };
-}
diff --git a/pkgs/development/python-modules/vcrpy/3.nix b/pkgs/development/python-modules/vcrpy/3.nix
deleted file mode 100644
index ddd4015aad1e..000000000000
--- a/pkgs/development/python-modules/vcrpy/3.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ buildPythonPackage
-, lib
-, six
-, fetchPypi
-, pyyaml
-, mock
-, contextlib2
-, wrapt
-, pytest
-, pytest-httpbin
-, yarl
-, pythonOlder
-, pythonAtLeast
-}:
-
-buildPythonPackage rec {
- pname = "vcrpy";
- version = "3.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc";
- };
-
- checkInputs = [
- pytest
- pytest-httpbin
- ];
-
- propagatedBuildInputs = [
- pyyaml
- wrapt
- six
- ]
- ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ]
- ++ lib.optionals (pythonAtLeast "3.4") [ yarl ];
-
- checkPhase = ''
- py.test --ignore=tests/integration -k "not TestVCRConnection"
- '';
-
- meta = with lib; {
- description = "Automatically mock your HTTP interactions to simplify and speed up testing";
- homepage = "https://github.com/kevin1024/vcrpy";
- license = licenses.mit;
- };
-}
-
diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix
index 69d77551fcd3..951ae8d9874d 100644
--- a/pkgs/development/python-modules/versionfinder/default.nix
+++ b/pkgs/development/python-modules/versionfinder/default.nix
@@ -1,8 +1,19 @@
-{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytestCheckHook, backoff, requests }:
+{ lib
+, backoff
+, buildPythonPackage
+, fetchFromGitHub
+, GitPython
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
buildPythonPackage rec {
pname = "versionfinder";
version = "1.1.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jantman";
@@ -22,11 +33,18 @@ buildPythonPackage rec {
];
disabledTestPaths = [
- # acceptance tests use the network
+ # Acceptance tests use the network
"versionfinder/tests/test_acceptance.py"
];
- pythonImportsCheck = [ "versionfinder" ];
+ disabledTests = [
+ # Tests are out-dated
+ "TestFindPipInfo"
+ ];
+
+ pythonImportsCheck = [
+ "versionfinder"
+ ];
meta = with lib; {
description = "Find the version of another package, whether installed via pip, setuptools or git";
diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
index cc6655a3b6c4..a456c5232d80 100644
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "vertica-python";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "ce0abfc5909d06031dc612ec321d7f75df50bcb47a31e14e882a299cea2ea7a3";
+ sha256 = "cfe1794c5ba9fdfbd470a55d82f60c2e08e129828367753bf64199a58a539bc2";
};
propagatedBuildInputs = [ future python-dateutil six ];
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index 8fc895cfa44c..3f272a84b89b 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -1,22 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi
-, case, pytest, pythonOlder }:
+{ lib
+, buildPythonPackage
+, case
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "vine";
version = "5.0.0";
+ format = "setuptools";
- disable = pythonOlder "2.7";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e";
+ hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34=";
};
- buildInputs = [ case pytest ];
+ checkInputs = [
+ case
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "vine"
+ ];
meta = with lib; {
description = "Python promises";
homepage = "https://github.com/celery/vine";
license = licenses.bsd3;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index e584b3de3e2d..2d0988473ddb 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
- version = "0.13.0";
+ version = "0.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = pname;
rev = version;
- sha256 = "sha256-yf1p56+mGVzG4HBlbIp/HvNSYJGQufzYjmPrtITaV5o=";
+ sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
new file mode 100644
index 000000000000..f4d14ed2e897
--- /dev/null
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -0,0 +1,138 @@
+{ bokeh
+, buildPythonPackage
+, click
+, configparser
+, docker_pycreds
+, fetchFromGitHub
+, flask
+, git
+, GitPython
+, jsonref
+, jsonschema
+, lib
+, matplotlib
+, pandas
+, pathtools
+, promise
+, protobuf
+, psutil
+, pydantic
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
+, python
+, python-dateutil
+, pyyaml
+, requests
+, scikit-learn
+, sentry-sdk
+, setuptools
+, shortuuid
+, stdenv
+, tqdm
+, yaspin
+}:
+
+buildPythonPackage rec {
+ pname = "wandb";
+ version = "0.12.9";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = "client";
+ rev = "v${version}";
+ sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y";
+ };
+
+ # The wandb requirements.txt does not distinguish python2/3 dependencies. We
+ # need to drop the subprocess32 dependency when building for python3.
+ patchPhase = ''
+ substituteInPlace requirements.txt --replace "subprocess32>=3.5.3" ""
+ '';
+
+ # git is not a setup.py dependency of wandb, but wandb does expect git to be
+ # in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf
+ # for the error message, and an example usage here: https://github.com/wandb/client/blob/master/wandb/sdk/internal/meta.py#L139-L141.
+ # setuptools is necessary since pkg_resources is required at runtime.
+ propagatedBuildInputs = [
+ click
+ configparser
+ docker_pycreds
+ git
+ GitPython
+ pathtools
+ promise
+ protobuf
+ psutil
+ python-dateutil
+ pyyaml
+ requests
+ sentry-sdk
+ setuptools
+ shortuuid
+ yaspin
+ ];
+
+ disabledTestPaths = [
+ # Tests that require docker access, not possible in the nix build environment.
+ "tests/launch/test_launch.py"
+ "tests/launch/test_launch_cli.py"
+
+ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
+ "tests/test_cli.py"
+ "tests/test_data_types.py"
+ "tests/test_file_stream.py"
+ "tests/test_file_upload.py"
+ "tests/test_footer.py"
+ "tests/test_internal_api.py"
+ "tests/test_label_full.py"
+ "tests/test_login.py"
+ "tests/test_meta.py"
+ "tests/test_metric_full.py"
+ "tests/test_metric_internal.py"
+ "tests/test_mode_disabled.py"
+ "tests/test_mp_full.py"
+ "tests/test_notebooks.py"
+ "tests/test_public_api.py"
+ "tests/test_redir.py"
+ "tests/test_runtime.py"
+ "tests/test_sender.py"
+ "tests/test_start_method.py"
+ "tests/test_tb_watcher.py"
+ "tests/test_telemetry_full.py"
+ "tests/wandb_agent_test.py"
+ "tests/wandb_artifacts_test.py"
+ "tests/wandb_history_test.py"
+ "tests/wandb_integration_test.py"
+ "tests/wandb_run_test.py"
+ "tests/wandb_settings_test.py"
+ "tests/wandb_sweep_test.py"
+
+ # Fails and borks the pytest runner as well.
+ "tests/wandb_test.py"
+ ];
+
+ checkInputs = [
+ bokeh
+ flask
+ jsonref
+ jsonschema
+ matplotlib
+ pandas
+ pydantic
+ pytest-mock
+ pytest-xdist
+ pytestCheckHook
+ scikit-learn
+ tqdm
+ ];
+
+ pythonImportsCheck = [ "wandb" ];
+
+ meta = with lib; {
+ description = "A CLI and library for interacting with the Weights and Biases API";
+ homepage = "https://github.com/wandb/client";
+ license = licenses.mit;
+ maintainers = with maintainers; [ samuela ];
+ };
+}
diff --git a/pkgs/development/python-modules/wavedrom/default.nix b/pkgs/development/python-modules/wavedrom/default.nix
index 906829363108..d8db35fbdaeb 100644
--- a/pkgs/development/python-modules/wavedrom/default.nix
+++ b/pkgs/development/python-modules/wavedrom/default.nix
@@ -1,8 +1,8 @@
{ lib
-, buildPythonPackage
-, fetchPypi
, attrdict
+, buildPythonPackage
, cairosvg
+, fetchPypi
, pillow
, pytestCheckHook
, setuptools-scm
@@ -14,9 +14,11 @@
buildPythonPackage rec {
pname = "wavedrom";
version = "2.0.3.post2";
+ format = "setuptools";
+
src = fetchPypi {
inherit pname version;
- sha256 = "239b3435ff116b09007d5517eed755fc8591891b7271a1cd40db9e400c02448d";
+ hash = "sha256-I5s0Nf8RawkAfVUX7tdV/IWRiRtycaHNQNueQAwCRI0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -32,22 +34,25 @@ buildPythonPackage rec {
];
checkInputs = [
+ cairosvg
+ pillow
pytestCheckHook
xmldiff
- pillow
- cairosvg
];
disabledTests = [
- "test_upstream" # requires to clone a full git repository
+ # Requires to clone a full git repository
+ "test_upstream"
];
- pythonImportsCheck = [ "wavedrom" ];
+ pythonImportsCheck = [
+ "wavedrom"
+ ];
- meta = {
+ meta = with lib; {
description = "WaveDrom compatible Python command line";
homepage = "https://github.com/wallento/wavedrompy";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ airwoodix ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ airwoodix ];
};
}
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index f43fd2d5462b..9ddb0631f5d2 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -4,6 +4,7 @@
, pytestCheckHook
, brotli
, cairosvg
+, flit-core
, fonttools
, pydyf
, pyphen
@@ -26,32 +27,33 @@
buildPythonPackage rec {
pname = "weasyprint";
- version = "53.4";
+ version = "54.0";
disabled = !isPy3k;
+ format = "pyproject";
+
src = fetchPypi {
inherit version;
pname = "weasyprint";
- sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA=";
+ sha256 = "0aeda9a045c7881289420cac917cc57115b1243e476187338e66d593dd000853";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "--isort --flake8 --cov --no-cov-on-fail" ""
- '';
-
- disabledTests = [
- # needs the Ahem font (fails on macOS)
- "test_font_stretch"
+ patches = [
+ (substituteAll {
+ src = ./library-paths.patch;
+ fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
+ pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
+ gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}";
+ pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
+ pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
+ harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}";
+ })
];
- checkInputs = [
- pytestCheckHook
- ghostscript
+ nativeBuildInputs = [
+ flit-core
];
- FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
-
propagatedBuildInputs = [
brotli
cairosvg
@@ -60,24 +62,38 @@ buildPythonPackage rec {
fonttools
html5lib
lxml
+ flit-core
pydyf
pyphen
tinycss
zopfli
];
- patches = [
- (substituteAll {
- src = ./library-paths.patch;
- fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
- pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
- gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}";
- pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
- pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
- harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}";
- })
+ checkInputs = [
+ pytestCheckHook
+ ghostscript
];
+ disabledTests = [
+ # needs the Ahem font (fails on macOS)
+ "test_font_stretch"
+ # sensitive to sandbox environments
+ "test_tab_size"
+ "test_tabulation_character"
+ ];
+
+ FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "--isort --flake8 --cov --no-cov-on-fail" ""
+ '';
+
+ preCheck = ''
+ # Fontconfig wants to create a cache.
+ export HOME=$TMPDIR
+ '';
+
meta = with lib; {
homepage = "https://weasyprint.org/";
description = "Converts web documents to PDF";
diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch
index 9a10990fd43f..bcd1c48ff61a 100644
--- a/pkgs/development/python-modules/weasyprint/library-paths.patch
+++ b/pkgs/development/python-modules/weasyprint/library-paths.patch
@@ -2,25 +2,26 @@ diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py
index 0734cbea..22e31a5e 100644
--- a/weasyprint/text/ffi.py
+++ b/weasyprint/text/ffi.py
-@@ -387,21 +387,11 @@ def _dlopen(ffi, *names):
+@@ -387,22 +387,11 @@ def _dlopen(ffi, *names):
return ffi.dlopen(names[0]) # pragma: no cover
-gobject = _dlopen(
- ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0',
-- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib')
+- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll')
-pango = _dlopen(
- ffi, 'pango-1.0-0', 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0',
-- 'libpango-1.0.dylib')
+- 'libpango-1.0.dylib', 'libpango-1.0-0.dll')
-harfbuzz = _dlopen(
- ffi, 'harfbuzz', 'harfbuzz-0.0', 'libharfbuzz-0',
-- 'libharfbuzz.so.0', 'libharfbuzz.so.0', 'libharfbuzz.0.dylib')
+- 'libharfbuzz.so.0', 'libharfbuzz.so.0', 'libharfbuzz.0.dylib',
+- 'libharfbuzz-0.dll')
-fontconfig = _dlopen(
-- ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig-1.dll',
-- 'libfontconfig.so.1', 'libfontconfig-1.dylib')
+- ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig.so.1',
+- 'libfontconfig-1.dylib', 'libfontconfig-1.dll')
-pangoft2 = _dlopen(
- ffi, 'pangoft2-1.0-0', 'pangoft2-1.0', 'libpangoft2-1.0-0',
-- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib')
+- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib', 'libpangoft2-1.0-0.dll')
+gobject = _dlopen(ffi, '@gobject@')
+pango = _dlopen(ffi, '@pango@')
+harfbuzz = _dlopen(ffi, '@harfbuzz@')
diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index 3a641ab2db3b..9622f10168f1 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "websocket-client";
- version = "1.2.1";
+ version = "1.2.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d";
+ sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix
deleted file mode 100644
index c03cc6935d2f..000000000000
--- a/pkgs/development/python-modules/werkzeug/1.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, itsdangerous, hypothesis
-, pytestCheckHook, requests
-, pytest-timeout
- }:
-
-buildPythonPackage rec {
- pname = "Werkzeug";
- version = "1.0.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
- };
-
- propagatedBuildInputs = [ itsdangerous ];
- checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
-
- postPatch = ''
- # ResourceWarning causes tests to fail
- rm tests/test_routing.py
- '';
-
- disabledTests = [
- "test_save_to_pathlib_dst"
- "test_cookie_maxsize"
- "test_cookie_samesite_attribute"
- "test_cookie_samesite_invalid"
- "test_range_parsing"
- "test_content_range_parsing"
- "test_http_date_lt_1000"
- "test_best_match_works"
- "test_date_to_unix"
- "test_easteregg"
-
- # Seems to be a problematic test-case:
- #
- # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
- # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
- # E
- # E Traceback (most recent call last):
- # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
- # E return Headers(result)
- # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
- "test_basic_routing"
- "test_merge_slashes_match"
- "test_merge_slashes_build"
- "TestMultiPart"
- "TestHTTPUtility"
- ] ++ lib.optionals stdenv.isDarwin [
- "test_get_machine_id"
- ];
-
- meta = with lib; {
- homepage = "https://palletsprojects.com/p/werkzeug/";
- description = "A WSGI utility library for Python";
- license = licenses.bsd3;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index 886ffea60b79..ea69a22c27b0 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "wled";
- version = "0.10.2";
+ version = "0.11.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-wled";
rev = "v${version}";
- sha256 = "sha256-tqR/edkBFseldSXGoekfRmw//h6Z/Xcg1W0HXJvLhtk=";
+ sha256 = "02mc9dbz7lvk7d8aaimggm3vg99bc42njsv8sfchvc9amvdi94qy";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix
index 29279cc1a448..94234b2626e2 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/pkgs/development/python-modules/wrf-python/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "wrf-python";
- version = "1.3.2";
+ version = "1.3.2.6";
src = fetchFromGitHub {
owner = "NCAR";
repo = "wrf-python";
rev = version;
- sha256 = "1rklkki54z5392cpwwy78bnmsy2ghc187l3j7nv0rzn6jk5bvyi7";
+ sha256 = "046kflai71r7xrmdw6jn0ifn5656wj9gpnwlgxkx430dgk7zbc2y";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix
index 7303a27f5b3e..b59b7aaa7d72 100644
--- a/pkgs/development/python-modules/wsgi-intercept/default.nix
+++ b/pkgs/development/python-modules/wsgi-intercept/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "wsgi-intercept";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchPypi {
pname = "wsgi_intercept";
inherit version;
- sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n";
+ sha256 = "0c4dc31dc7aabdd263ba45338c201b89e3096a3baaa7d8e3260c68ff18016fb4";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix
deleted file mode 100644
index a8488d8c4ab8..000000000000
--- a/pkgs/development/python-modules/wsproto/0.14.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }:
-
-buildPythonPackage rec {
- pname = "wsproto";
- version = "0.14.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd";
- };
-
- propagatedBuildInputs = [ h11 enum34 ];
-
- checkInputs = [ pytest ];
-
- checkPhase = ''
- py.test
- '';
-
- meta = with lib; {
- description = "Pure Python, pure state-machine WebSocket implementation";
- homepage = "https://github.com/python-hyper/wsproto/";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index 96440c438bcb..48764d509fe8 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -2,21 +2,29 @@
, buildPythonPackage
, fetchPypi
, markupsafe
+, Babel
+, pytestCheckHook
+, email_validator
}:
buildPythonPackage rec {
- version = "2.3.3";
+ version = "3.0.1";
pname = "WTForms";
src = fetchPypi {
inherit pname version;
- sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c";
+ sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";
};
- propagatedBuildInputs = [ markupsafe ];
+ propagatedBuildInputs = [ markupsafe Babel ];
- # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
- doCheck = false;
+
+ checkInputs = [
+ pytestCheckHook
+ email_validator
+ ];
+
+ pythonImportsCheck = [ "wtforms" ];
meta = with lib; {
description = "A flexible forms validation and rendering library for Python";
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
deleted file mode 100644
index 6649c5f69315..000000000000
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ fetchurl
-, lib
-, stdenv
-, darwin
-, openglSupport ? true
-, libX11
-, wxGTK
-, wxmac
-, pkg-config
-, buildPythonPackage
-, pyopengl
-, isPy3k
-, isPyPy
-, python
-, cairo
-, pango
-}:
-
-assert wxGTK.unicode;
-
-buildPythonPackage rec {
- pname = "wxPython";
- version = "3.0.2.0";
-
- disabled = isPy3k || isPyPy;
- doCheck = false;
-
- src = fetchurl {
- url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
- sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
- };
-
- dontUseSetuptoolsBuild = true;
- dontUsePipInstall = true;
-
- hardeningDisable = [ "format" ];
-
- nativeBuildInputs = [ pkg-config ]
- ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
- ++ (lib.optionals stdenv.isDarwin [ wxmac ]);
-
- buildInputs = [ ]
- ++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ])
- ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- ApplicationServices
- AudioToolbox
- CFNetwork
- Carbon
- Cocoa
- CoreGraphics
- CoreServices
- CoreText
- DiskArbitration
- IOKit
- ImageIO
- OpenGL
- Security
- ]))
- ++ (lib.optional openglSupport pyopengl);
-
- preConfigure = ''
- cd wxPython
- # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch
- substituteInPlace config.py \
- --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" ""
- # set the WXPREFIX to $out instead of the storepath of wxwidgets
- substituteInPlace config.py \
- --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'"
- # this check is supposed to only return false on older systems running non-framework python
- substituteInPlace src/osx_cocoa/_core_wrap.cpp \
- --replace "return wxPyTestDisplayAvailable();" "return true;"
- '' + lib.optionalString (!stdenv.isDarwin) ''
- substituteInPlace wx/lib/wxcairo.py \
- --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
- substituteInPlace wx/lib/wxcairo.py \
- --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
- ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"),
- ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
- ("appsvc", None)
- ]}'
- '';
-
- buildPhase = "";
-
- installPhase = ''
- ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
- wrapPythonPrograms
- '';
-
- passthru = { inherit wxGTK openglSupport; };
-}
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 37fb5edf7011..5f780a61ffc5 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -5,8 +5,8 @@
, pandas
, pytestCheckHook
, pythonOlder
-, setuptools
, setuptoolsBuildHook
+, setuptools-scm
}:
buildPythonPackage rec {
@@ -21,14 +21,16 @@ buildPythonPackage rec {
sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc=";
};
+ SETUPTOOLS_SCM_PRETEND_VERSION="${version}";
+
nativeBuildInputs = [
setuptoolsBuildHook
+ setuptools-scm
];
propagatedBuildInputs = [
numpy
pandas
- setuptools
];
checkInputs = [
diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix
new file mode 100644
index 000000000000..7abf151a08f7
--- /dev/null
+++ b/pkgs/development/python-modules/yacs/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, pyyaml
+}:
+
+buildPythonPackage rec {
+ pname = "yacs";
+ version = "0.1.8";
+
+ src = fetchFromGitHub {
+ owner = "rbgirshick";
+ repo = "yacs";
+ rev = "v${version}";
+ sha256 = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0=";
+ };
+
+ propagatedBuildInputs = [ pyyaml ];
+
+ pythonImportsCheck = [ "yacs" ];
+ checkPhase = ''
+ ${python.interpreter} yacs/tests.py
+ '';
+
+ meta = with lib; {
+ description = "Yet Another Configuration System";
+ homepage = "https://github.com/rbgirshick/yacs";
+ license = licenses.apsl20;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 9b9ef513f70d..d83b031fe4c4 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "yalexs";
- version = "1.1.15";
+ version = "1.1.19";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EK9jmbU3A2rNx/H8WOsZiGA7tqzg/XJkW/DV5s+2Y3U=";
+ sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix
new file mode 100644
index 000000000000..012ee677ae0e
--- /dev/null
+++ b/pkgs/development/python-modules/yaspin/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, poetry-core
+, termcolor
+}:
+
+buildPythonPackage rec {
+ pname = "yaspin";
+ version = "2.1.0";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "pavdmyt";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vhh4mp706kz5fba8nvr9jm51jsd32xj97m3law6ixw3lj91sh1a";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [ termcolor ];
+
+ pythonImportsCheck = [ "yaspin" ];
+
+ meta = with lib; {
+ description = "Yet Another Terminal Spinner";
+ homepage = "https://github.com/pavdmyt/yaspin";
+ license = licenses.mit;
+ maintainers = with maintainers; [ samuela ];
+ };
+}
diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix
index ad23a6cc169d..35f470e319f0 100644
--- a/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/pkgs/development/python-modules/youtube-search-python/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "youtube-search-python";
- version = "1.5.2";
+ version = "1.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "33f0d58f4803b0b2badf860cd31fb83d3f7edecdd2c01dd09cd6511abbf0e6b9";
+ sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0";
};
propagatedBuildInputs = [ httpx ];
diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index b19aed0c6fdc..218c2edd0ac5 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ytmusicapi";
- version = "0.19.5";
+ version = "0.20.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-haZe5afwkU8wD8s2lrmHJuVo6TO3CcQ/0TuJbHPmqvU=";
+ hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix
new file mode 100644
index 000000000000..9f22cd1dfc86
--- /dev/null
+++ b/pkgs/development/python-modules/zcs/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, yacs
+, boxx
+}:
+
+buildPythonPackage rec {
+ pname = "zcs";
+ version = "0.1.17";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw=";
+ };
+
+ propagatedBuildInputs = [ yacs ];
+
+ pythonImportsCheck = [ "zcs" ];
+
+ checkInputs = [ boxx ];
+ checkPhase = ''
+ ${python.interpreter} test/test_zcs.py
+ '';
+
+ meta = with lib; {
+ description = "A flexible powerful configuration system which takes advantage of both argparse and yacs";
+ homepage = "https://github.com/DIYer22/zcs";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucasew ];
+ };
+}
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index f88e8bc47420..1b3e0c5fcdf0 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -28,6 +28,7 @@
buildPythonPackage rec {
pname = "zeep";
version = "4.1.0";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -71,9 +72,15 @@ buildPythonPackage rec {
disabledTests = [
# lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64
"test_mime_content_serialize_text_xml"
+ # Tests are outdated
+ "test_load"
+ "test_load_cache"
+ "test_post"
];
- pythonImportsCheck = [ "zeep" ];
+ pythonImportsCheck = [
+ "zeep"
+ ];
meta = with lib; {
description = "Python SOAP client";
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 8a3bd0e41fd2..31a45ab64477 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy-znp";
- version = "0.6.4";
+ version = "0.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "v${version}";
- sha256 = "0hz483wqzpdaap96gbjasisxd4wy8f4lslnspcvzqcf4dy1mxln6";
+ sha256 = "0h6dclz4q4lvmapzpslh8kb0aihdjddbkxc4zc981glbip89li5w";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 01751219d400..20d5237f76e8 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zigpy";
- version = "0.42.0";
+ version = "0.43.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = version;
- sha256 = "sha256-kSUFcN3QOZWFBgDrOopkYuUyBE9asO6MXf0H9CMjFlc=";
+ sha256 = "1740cv99ny6xy7wfpz754h4wj2cm874b8vnddvff90ajk07qgdia";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix
deleted file mode 100644
index 82f100aaa0d1..000000000000
--- a/pkgs/development/python-modules/zipp/1.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools-scm
-, pytest
-, pytest-flake8
-, more-itertools
-}:
-
-buildPythonPackage rec {
- pname = "zipp";
- version = "1.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
-
- propagatedBuildInputs = [ more-itertools ];
-
- checkInputs = [ pytest pytest-flake8 ];
-
- checkPhase = ''
- pytest
- '';
-
- # Prevent infinite recursion with pytest
- doCheck = false;
-
- meta = with lib; {
- description = "Pathlib-compatible object wrapper for zip files";
- homepage = "https://github.com/jaraco/zipp";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix
index 2998376b6726..0b5d3103b64d 100644
--- a/pkgs/development/python-modules/zope-deferredimport/default.nix
+++ b/pkgs/development/python-modules/zope-deferredimport/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "zope-deferredimport";
- version = "4.3";
+ version = "4.3.1";
src = fetchPypi {
pname = "zope.deferredimport";
inherit version;
- sha256 = "2ddef5a7ecfff132a2dd796253366ecf9748a446e30f1a0b3a636aec9d9c05c5";
+ sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1";
};
propagatedBuildInputs = [ zope_proxy ];
diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix
index 6c19ffbec029..993568f6ffd9 100644
--- a/pkgs/development/python-modules/zope-hookable/default.nix
+++ b/pkgs/development/python-modules/zope-hookable/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "zope-hookable";
- version = "5.0.1";
+ version = "5.1.0";
src = fetchPypi {
pname = "zope.hookable";
inherit version;
- sha256 = "0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19";
+ sha256 = "8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e";
};
checkInputs = [ zope_testing ];
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index 5d2066f45f21..856ca0ee0249 100755
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "zstandard";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046";
+ sha256 = "fa9194cb91441df7242aa3ddc4cb184be38876cb10dd973674887f334bafbfb6";
};
propagatedNativeBuildInputs = [ cffi ];
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index e7ee8dd68cb9..468b5b5315ab 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "zstd";
- version = "1.5.0.2";
+ version = "1.5.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8d3388a15135c481b28ca67d079cb5fd79a9691626fd9979e6b4ec00eabb9e79";
+ sha256 = "9519bb0cd91c4498cd8cf66ef88fb22e5d6a442317704e6afd00b12726d17d0a";
};
postPatch = ''