ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
29019 commits 1 branch 0 tags 448 MiB
Commit graph

50 commits

Author SHA1 Message Date
Jane Baines
0458ab53f6
gnu: python-django: Update to 1.11.10. 
* gnu/packages/django.scm (python-django)[version]: Update to version 1.11.10.
  [arguments]: Patch test helper to add python-pytz to the PYTHONPATH.
  [inputs]: Remove python-pytz.
  [propagated-inputs]: Add python-pytz.

Signed-off-by: Christopher Baines <mail@cbaines.net>
 2018-02-24 19:40:27 +00:00
Marius Bakke
04941fc550
gnu: python-django: Use the test-only tzdata package for tests. 
* gnu/packages/django.scm (python-django)[native-inputs]: Replace TZDATA with
TZDATA-FOR-TESTS.
 2018-02-01 16:15:39 +01:00
Marius Bakke
c8ccf7c5c8
gnu: pootle: Don't require python-pytest-warnings. 
* gnu/packages/django.scm (pootle)[native-inputs]: Replace
PYTHON2-PYTEST-WARNINGS with PYTHON2-PYTEST.
 2018-02-01 11:09:16 +01:00
Mark H Weaver
a102d359a6
Merge branch 'master' into core-updates 2018-01-23 17:01:07 -05:00
Ricardo Wurmus
40fac51a19
gnu: Add python-django-tagging. 
* gnu/packages/django.scm (python-django-tagging, python2-django-tagging): New
variables.
 2018-01-21 19:38:51 +01:00
Marius Bakke
77181815ae
Merge branch 'master' into core-updates 2017-12-05 23:41:30 +01:00
Christopher Baines
17dc2a0997
gnu: django: Fix building python-django-allauth. 
* gnu/packages/django.scm (python-django-allauth)[arguments]: Modify the
  standard phases to skip a test, and run the tests using django-admin with
  the settings configured.
 2017-11-24 22:16:33 +00:00
Marius Bakke
2dd12924cf
Merge branch 'master' into core-updates 2017-11-19 15:01:00 +01:00
Ricardo Wurmus
33dc54b08c
gnu: Move date/time packages from python.scm to time.scm. 
* gnu/packages/python.scm (python-pytz, python2-pytz, python-dateutil,
python2-dateutil, python-parsedatetime, python2-parsedatetime,
python-tzlocal, python-isodate, python2-isodate, python-iso8601,
python2-iso8601, python-monotonic, python2-monotonic, python-pyrfc3339,
python2-pyrfc3339, python-arrow, python2-arrow, python-aniso8601,
python2-aniso8601): Move from here...
* gnu/packages/time.scm: ...to here.
* gnu/packages/calendar.scm,
gnu/packages/check.scm,
gnu/packages/django.scm,
gnu/packages/ebook.scm,
gnu/packages/gnome.scm,
gnu/packages/irc.scm,
gnu/packages/jrnl.scm,
gnu/packages/mail.scm,
gnu/packages/openstack.scm,
gnu/packages/package-management.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/rdf.scm,
gnu/packages/statistics.scm,
gnu/packages/tls.scm,
gnu/packages/tryton.scm,
gnu/packages/version-control.scm: Adjust accordingly.
 2017-11-18 12:45:19 +01:00
Ricardo Wurmus
ac257f127a
gnu: Move testing packages from python.scm to check.scm. 
* gnu/packages/python.scm (python-behave-web-api, python2-behave-web-api,
python-mock, python2-mock, python-mock-2, python-nose, python2-nose,
python-nose2, python2-nose2, python-unittest2, python2-unittest2,
python-pytest, python2-pytest, python-pytest-3.0, python2-pytest-3.0,
python-pytest-cov, python2-pytest-cov, python-pytest-runner,
python2-pytest-runner, python-pytest-mock, python2-pytest-mock,
python-pytest-xdist, python2-pytest-xdist, python-scripttest,
python2-scripttest, python-testtools, python2-testtools, python-testscenarios,
python2-testscenarios, python-testresources, python2-testresources,
python-subunit, python2-subunit, python-fixtures, python2-fixtures,
python-testrepository, python2-testrepository, python-coverage,
python2-coverage, python-cov-core, python2-cov-core, python-testpath,
python2-testpath, python-testlib, python2-testlib, python-pytest-cache,
python2-pytest-cache, python-pytest-localserver, python-pytest-xprocess,
python-pytest-subtesthack, python2-pytest-subtesthack, python-hypothesis,
python2-hypothesis, python-lit, python2-lit, python-pytest-pep8,
python2-pytest-pep8, python-pytest-flakes, python2-pytest-flakes,
python2-coverage-test-runner, python-pylint, python2-pylint,
python-paramunittest, python2-python-paramunittest, python-pytest-warnings,
python2-pytest-warnings, python-pytest-capturelog, python2-pytest-capturelog,
python-pytest-catchlog, python2-pytest-catchlog, python-nosexcover,
python2-nosexcover, python-discover, python2-discover, behave, python-rednose,
python2-rednose, python-nose-randomly, python2-nose-randomly,
python-nose-timer, python2-nose-timer): Move from here...
* gnu/packages/check.scm: ...to here.
* gnu/packages/admin.scm,
gnu/packages/android.scm,
gnu/packages/backup.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/calendar.scm,
gnu/packages/dav.scm,
gnu/packages/django.scm,
gnu/packages/freedesktop.scm,
gnu/packages/haskell.scm,
gnu/packages/image.scm,
gnu/packages/irc.scm,
gnu/packages/jrnl.scm,
gnu/packages/ldc.scm,
gnu/packages/libffi.scm,
gnu/packages/mail.scm,
gnu/packages/mpd.scm,
gnu/packages/openstack.scm,
gnu/packages/package-management.scm,
gnu/packages/password-utils.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/rdf.scm,
gnu/packages/statistics.scm,
gnu/packages/storage.scm,
gnu/packages/time.scm,
gnu/packages/tls.scm,
gnu/packages/tor.scm,
gnu/packages/tryton.scm: Adjust accordingly.
 2017-11-17 22:36:26 +01:00
Ludovic Courtès
1b2f753d9c
gnu: Move web packages from python to python-web. 
This is in part to address <https://bugs.gnu.org/27284>.

* gnu/packages/python.scm (python-httplib2, python2-httplib2)
(python-sockjs-tornado, python2-sockjs-tornado)
(python-flask-babel, python2-flask-babel)
(python-html5lib, python2-html5lib)
(python-html5lib-0.9, python2-html5lib-0.9)
(python-html5-parser, python2-html5-parser)
(python-webencodings, python2-webencodings)
(python-openid, python2-openid, python-cssutils, python2-cssutils)
(python-cssselect, python2-cssutils)
(python-openid-cla, python2-openid-cla)
(python-openid-teams, python2-openid-teams)
(python-tornado, python2-tornado)
(python-tornado-http-auth, python-terminado, python2-terminado)
(python-webob, python2-webob, python-zope-event, python2-zope-event)
(python-zope-interface, python2-zope-interface)
(python-zope-exceptions, python2-zope-exceptions)
(python-zope-testing, python2-zope-testing)
(python-zope-testrunner, python2-zope-testrunner)
(python-zope-i18nmessageid, python2-zope-i18nmessageid)
(python-zope-schema, python2-zope-schema)
(python-zope-configuration, python2-zope-configuration)
(python-zope-proxy, python2-zope-proxy)
(python-zope-location, python2-zope-location)
(python-zope-security, python2-zope-security)
(python-zope-component, python2-zope-component)
(python-ndg-httpsclient, python2-ndg-httpsclient)
(python-websocket-client, python2-websocket-client)
(python-requests-toolbelt, python2-requests-toolbelt)
(python-rauth, python2-rauth, python-urllib3, python2-urllib3)
(awscli, python-wsgiproxy2, python2-wsgiproxy2)
(python-pastedeploy, python2-pastedeploy)
(python-webtest, python2-webtest, python-flask, python2-flask)
(python-flast-wtf, python2-flask-wtf)
(python-flask-multistatic, python2-flask-multistatic)
(python-cookies, python2-cookies)
(python-responses, python2-responses)
(python-geventhttpclient, python2-geventhttpclient)
(python-requests-oauthlib, python2-requests-oauthlib)
(python-url, python2-url, python-cachecontrol, python2-cachecontrol)
(python-betamax, python2-betamax)
(python-betamax-matchers, python2-betamax-matchers)
(python-s3transfer, python2-s3transfer)
(python-flask-restful, python-flask-basicauth)
(python-flask-sqlalchemy, python-flask-restplus)
(python-flask-restful-swagger, python-htmlmin, python2-htmlmin)
(python-flask-htmlmin, python2-flask-htmlmin)
(python-flask-login, python2-flask-login)
(python-oauth2client, python-flask-oidc)
(python-webassets, python-cssmin, python2-cssmin)
(python-elasticsearch, python2-elasticsearch)
(python-flask-script, python2-flask-script)
(python-flask-migrate, python2-flask-migrate)
(python-genshi, python2-genshi)
(python-flask-principal, python2-flask-principal)
(python-flask-httpauth, python2-flask-httpauth)
(python-uritemplate, python2-uritemplate): Move to...
* gnu/packages/python-web.scm: ... here.  New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/admin.scm, gnu/packages/backup.scm,
gnu/packages/dav.scm, gnu/packages/django.scm,
gnu/packages/docker.scm, gnu/packages/ebook.scm,
gnu/packages/logging.scm, gnu/packages/mail.scm,
gnu/packages/music.scm, gnu/packages/openstack.scm,
gnu/packages/package-management.scm, gnu/packages/rdf.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/tryton.scm, gnu/packages/version-control.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm: Adjust accordingly.
 2017-11-13 23:41:01 +01:00
Tobias Geerinckx-Rice
f737d9f2fb
gnu: python-pytest-django: Use python-pytest@3. 
* gnu/packages/django.scm (python-pytest-django)[propagated-inputs]: Replace
python-pytest with python-pytest-3.0.
 2017-10-23 14:49:30 +02:00
Marius Bakke
777f485ee6
gnu: python-django: Update to 1.10.8 [fixes CVE-2017-12794]. 
* gnu/packages/django.scm (python-django): Update to 1.10.8.
 2017-09-12 22:55:05 +02:00
Julien Lepiller
2601171ee0
gnu: Add pootle. 
* gnu/packages/django.scm (pootle): New variable.
 2017-05-11 21:58:41 +02:00
Julien Lepiller
919d4ad079
gnu: python-pytest-django: Update to 3.1.2. 
* gnu/packages/django.scm (python-pytest-django, python2-pytest-django):
Update to 3.1.2.
 2017-05-11 21:58:27 +02:00
Julien Lepiller
f77d82f105
gnu: Add python-django-statici18n. 
* gnu/packages/django.scm (python-django-statici18n, python2-django-statici18n):
New variables.
 2017-05-11 21:58:25 +02:00
Julien Lepiller
9f4a305961
gnu: Add python-django-appconf. 
* gnu/packages/django.scm (python-django-appconf, python2-django-appconf):
New variables.
 2017-05-11 21:58:22 +02:00
Julien Lepiller
b0395dd68e
gnu: Add python-django-sortedm2m. 
* gnu/packages/django.scm (python-django-sortedm2m, python2-django-sortedm2m):
New variables.
 2017-05-11 21:58:18 +02:00
Julien Lepiller
cb9b6095dc
gnu: Add python-django-rq. 
* gnu/packages/django.scm (python-django-rq, python2-django-rq): New variables.
 2017-05-11 21:58:15 +02:00
Julien Lepiller
b939953b9a
gnu: Add python-django-redis. 
* gnu/packages/django.scm (python-django-redis, python2-django-redis):
New variables.
 2017-05-11 21:58:12 +02:00
Julien Lepiller
932462536b
gnu: Add python-django-overextends. 
* gnu/packages/django.scm (python-django-overextends, python2-django-overextends):
New variables.
 2017-05-11 21:58:04 +02:00
Julien Lepiller
659692c0c3
gnu: Add python-django-contrib-comments. 
* gnu/packages/django.scm (python-django-contrib-comments,
python2-django-contrib-comments): New variables.
 2017-05-11 21:58:02 +02:00
Julien Lepiller
03a34e87b8
gnu: Add python-django-contact-form. 
* gnu/packages/django.scm (python-django-contact-form, python2-django-contact-form):
New variables.
 2017-05-11 21:57:59 +02:00
Julien Lepiller
afbfe56497
gnu: Add python-django-bulk-update. 
* gnu/packages/django.scm (python-django-bulk-update, python2-django-bulk-update):
New variables.
 2017-05-11 21:57:57 +02:00
Julien Lepiller
a326384be4
gnu: Add python-dj-database-url. 
* gnu/packages/django.scm (python-dj-database-url, python2-dj-database-url):
New variables.
 2017-05-11 21:57:54 +02:00
Julien Lepiller
6c17e963b0
gnu: Add python-django-jsonfield. 
* gnu/packages/django.scm (python-django-jsonfield, python2-django-jsonfield):
New variables.
 2017-05-11 21:57:51 +02:00
Julien Lepiller
01c64cb83f
gnu: Add python-django-assets. 
* gnu/packages/django.scm (python-django-assets, python2-django-assets):
New variables.
 2017-05-11 21:57:48 +02:00
ng0
14d8f6538f
gnu: Add python-django-gravatar2. 
* gnu/packages/django.scm (python-django-gravatar2): New variable.

Signed-off-by: Kei Kebreau <kei@openmailbox.org>
 2017-04-08 12:40:20 -04:00
ng0
e1f06e1192
gnu: Add python-django-allauth. 
* gnu/packages/django.scm (python-django-allauth): New variable.

Signed-off-by: Kei Kebreau <kei@openmailbox.org>
 2017-04-08 12:40:16 -04:00
Marius Bakke
33b2520175
gnu: python-django: Specify CPE name. 
* gnu/packages/django.scm (python-django, python2-django)[properties]: Add
"cpe-name".
 2017-04-04 18:30:52 +02:00
Marius Bakke
dcc9b6abc7
gnu: python-django: Update to 1.10.7 [fixes CVE-2017-7233 and CVE-2017-7234]. 
* gnu/packages/django.scm (python-django, python2-django): Update to 1.10.7.
 2017-04-04 18:01:32 +02:00
Marius Bakke
424b1ae769
Merge branch 'master' into python-tests 2017-02-13 22:35:05 +01:00
Hartmut Goebel
117134a78f
gnu: python-django: Update to 1.10.5. 
* gnu/packages/django.scm(python-django): Update to 1.10.5.
 2017-01-14 23:43:02 +01:00
Marius Bakke
1f31a5e0bf
gnu: python-pytest-django: Disable tests. 
* gnu/packages/django.scm (python-pytest-django,
  python2-pytest-django)[arguments]: Set #:tests? #f.
 2016-12-15 18:19:34 +01:00
Marius Bakke
55ab64516b
gnu: python-django-filter: Fix test suite. 
* gnu/packages/django.scm (python-django-filter,
  python2-django-filter)[arguments]: Replace 'check' phase with custom command.
 2016-12-14 12:43:36 +01:00
Marius Bakke
281cc11c8e
gnu: python-django-simple-math-captcha: Disable tests. 
* gnu/packages/django.scm (python-django-simple-math-captcha,
  python2-django-simple-math-captcha)[arguments]: Set #:tests? #f.
 2016-12-14 12:40:13 +01:00
Hartmut Goebel
bac6816879
gnu: python-pytest-django: Remove needless propagated input "python-py". 
This is already propagated by python-pytest.

* gnu/packages/python.scm (python-pytest-django) [propagated-inputs]:
  Remove python-py.
 2016-11-15 22:32:02 +01:00
Hartmut Goebel
f22efa0152
gnu: Fix python inputs, part 1: all inputs become propagated-inputs. 
This patch contains the changes where all [inputs] are changed to
[propagated-inputs]

* gnu/packages/python.scm (python-passlib, python-paramiko, python-ccm,
  python-babel, python-keyring python-pandas, python-tzlocal,
  python-parse-type, python-nose2, python-pytest, python-pytest-mock,
  python-pytest-xdist, python-scripttest, python-testtools, python-pytest-cov,
  python-testscenarios, python-pbr-0.11, python-oauthlib, python-jinja2,
  python-sphinx, python-tzlocal, python-bugz, python2-pytest-mock, behave,
  pelican, sqlalchemy-utils, python-pygridtools, python-urwidtrees,
  python-tornado, python2-tornado, python-debian, python-execnet,
  python-pytest-cache, pytest-localserver, python-clint, python-rply,
  python-hy, python-rauth, python-rsa, python-celery, python-vobject, s3cmd,
  python-prompt-toolkit, ptpython, python-requests-oauthlib, python-stem,
  python-binaryornot, python2-binaryornot, python-nltk, python-pymongo,
  python-schematics, python-url, python2-url, python-freezegun,
  python-glances, python-graphql-core, python-graphql-relay, python-graphene,
  python-nautilus, python-s3transfer): All [inputs] become
  [propagated-inputs].
* gnu/packages/bioinformatics.scm (python-biopython): Likewise.
* gnu/packages/django.scm (pytest-django): Likewise.
* gnu/packages/mail.scm (python-mailmanclient): Likewise.
* gnu/packages/password-utils.scm (python-bcrypt): Likewise.
* gnu/packages/propbuf.scm (python-protobuf): Likewise.
* gnu/packages/rdf.scm (python-rdflib): Likewise.

SQACH all become propagated
 2016-11-15 22:31:03 +01:00
Hartmut Goebel
5c31f4aa7c
gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) 
This patch contains the changes for all modules beside python.scm where
setuptools are used in an inherited package and removing this input also
removes the need for inheriting the package. This is the case if adding
setuptools in the inherited package was the only change.

Change this to not inherit and remove the new needless call to
"strip-python2-variant (if applicable).

* gnu/packages/bioinformatics.scm (python-biopython, python2-biopython,
  python-twobitreader, python2-twobitreader,
  python-plastid, python2-plastid,
  python2-pybigwig,
  python2-screed,
  sra-tools): No longer "inherit" Python 2 packages
  inheriting from a Python 3 package if the sole reason for inheriting was
  adding python-setuptools respective python2-setuptools to [inputs],
  [native-inputs] or [propagated-inputs]. Remove now needless [properties]
  "python2-variant" where applicable.
* gnu/packages/django.scm (python-pytest-django, python2-pytest-django,
  python-django-filter, python2-django-filter): Likewise.
* gnu/packages/gnupg.scm (python2-pygpgme): Likewise.
* gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient):
  Likewise.
* gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise.
* gnu/packages/music.scm (python-pylast, python2-pylast): Likewise.
* gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock,
  python2-git-review): Likewise.
* gnu/packages/password-utils.scm (python2-bcrypt): Likewise.
* gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise.
* gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise.
* gnu/packages/web.scm (python2-feedparser): Likewise.
 2016-11-15 22:28:59 +01:00
Hartmut Goebel
5d85493284
gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b) 
This patch contains the changes in all modules beside python.scm where
removing setuptools from the inputs could be achieved by removing complete
lines.

* gnu/packages/admin.scm (graphios, thefuck): Remove all [inputs],
  [native-inputs] and [propagated-inputs] where python-setuptools or
  python2-setuptools are the sole entries. Remove python-setuptools and
  python2-setuptools listed on a line by its own from [inputs],
  [native-inputs] and [propagated-inputs].
* gnu/packages/backup.scm (rdiff-backup): Likewise.
* gnu/packages/bioinformatics.scm (htseq, macs, python2-pbcore, rseqc,
  multiqc): Likewise.
* gnu/packages/django.scm (python-django, python2-django,
  python-django-simple-math-captcha, python2-django-simple-math-captcha):
  Likewise.
* gnu/packages/docker.scm (python-docker-py, docker-compose): Likewise.
* gnu/packages/game-development.scm (python-pygame): Likewise.
* gnu/packages/key-mon.scm (key-mon): Likewise.
* gnu/packages/mail.scm (khard): Likewise.
* gnu/packages/music.scm (beets, python2-pyechonest): Likewise.
* gnu/packages/openstack.scm (python-bandit, python2-bandit,
  python-debtcollector, python2-debtcollector,
  python-mox3, python2-mox3,
  python-os-client-config, python2-os-client-config,
  python-oslo.config, python2-oslo.config,
  python-oslo.context, python2-oslo.context,
  python-oslo.i18n, python2-oslo.i18n,
  python-oslo.serialization, python2-oslo.serialization,
  python-oslosphinx, python2-oslosphinx,
  python-oslotest, python2-oslotest,
  python-oslo.utils, python2-oslo.utils,
  python-swiftclient, python2-swiftclient): Likewise.
* gnu/packages/pdf.scm (pdfposter): Likewise.
* gnu/packages/tls.scm (python-acme, python2-acme): Likewise.
 2016-11-15 21:58:44 +01:00
Leo Famulari
b3cc0dce08
Merge branch 'master' into core-updates 2016-11-02 20:03:35 -04:00
Marius Bakke
bac3d6095d
gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013,9014}]. 
* gnu/packages/django.scm (python-django, python2-django): Update to 1.10.3.
[source]: Remove patch.
* gnu/packages/patches/python-django-fix-testcase.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
 2016-11-01 14:02:01 -04:00
Efraim Flashner
d18c69aa2a
gnu: python-pytest-django: Add missing test input. 
* gnu/packages/django.scm (python-pytest-django)[native-inputs]: Add
python-django.
 2016-10-27 22:27:31 +03:00
Efraim Flashner
fa7cd33378
gnu: python-django-filter: Add inputs for tests. 
* gnu/packages/django.scm (python-django-filter)[native-inputs]: Add
python-django, python-mock.
 2016-10-27 22:18:30 +03:00
Efraim Flashner
cda5e76f51
gnu: python2-django: Fix typo in native-inputs. 
* gnu/packages/django.scm (python2-django)[native-inputs]: Inherit from
python-django's native-inputs, not its inputs.
 2016-09-22 22:42:47 +03:00
Hartmut Goebel
dfdaea32e9
gnu: python-django, python2-django: Fix propagated- and native-inputs. 
setuptools is a run-time dependency (sic!), all others are required
for testing only.

* gnu/packages/django.scm (python-django) [propagated-inputs,
  native-inputs]: Exchange them. Move tzdata to new native-inputs.
  Enhance comments.
  (python2-django) [propagated-inputs] change into native-inputs.
  Enhance comment.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2016-09-19 23:41:23 +09:00
Efraim Flashner
894810c7c9
gnu: Add python-django-filter. 
* gnu/packages/django.scm (python-django-filter): New variable.
 2016-09-18 23:19:45 +03:00
Efraim Flashner
23b563dcfd
gnu: Add python-pytest-django. 
* gnu/packages/django.scm (python-pytest-django): New variable.
 2016-09-18 23:19:45 +03:00
Hartmut Goebel
b53fc2940f
gnu: Add python-django-simple-math-captcha. 
* gnu/packages/django.scm: (python-django-simple-math-captcha)
(python2-django-simple-math-captcha): New variables.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2016-09-12 15:27:46 +02:00
Hartmut Goebel
d18197af78
gnu: Add python-django. 
* gnu/packages/django.scm: New file.
* gnu/packages/patches/python-django-fix-testcase.patch: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add django.scm.
(dist_patch_DATA): Add python-django-fix-testcase.patch.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
 2016-09-12 15:27:46 +02:00